From d33602e1314f6b9d889e990dc686929c4e1b24ea Mon Sep 17 00:00:00 2001 From: James Powell Date: Fri, 22 Jun 2018 18:55:26 -0400 Subject: [PATCH] small test fixes --- .travis.yml | 3 +-- README.rst | 4 ++-- hooks/pre-commit | 3 +++ tests/CORONET_Global_Topology.xls | Bin 0 -> 48128 bytes tests/parsers_test.py | 27 ++++++++++++++++----------- 5 files changed, 22 insertions(+), 15 deletions(-) create mode 100755 hooks/pre-commit create mode 100644 tests/CORONET_Global_Topology.xls diff --git a/.travis.yml b/.travis.yml index bc6ebc20..99f39951 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,8 @@ python: - "3.6" # command to install dependencies install: - - pip install -r requirements.txt + - python setup.py install # command to run tests before_script: - - export PYTHONPATH=$PYTHONPATH:/home/travis/build/Orange-OpenSource/gnpy/examples script: - pytest diff --git a/README.rst b/README.rst index 820a05a0..da9e20f5 100644 --- a/README.rst +++ b/README.rst @@ -187,8 +187,8 @@ implementations. :alt: Documentation Status :scale: 100% -.. |build| image:: https://travis-ci.org/mcantono/gnpy.svg?branch=develop - :target: https://travis-ci.org/mcantono/gnpy +.. |build| image:: https://travis-ci.org/Telecominfraproject/oopt-gnpy.svg?branch=develop + :target: https://travis-ci.org/Telecominfraproject/oopt-gnpy :alt: Build Status :scale: 100% diff --git a/hooks/pre-commit b/hooks/pre-commit new file mode 100755 index 00000000..a0c56c89 --- /dev/null +++ b/hooks/pre-commit @@ -0,0 +1,3 @@ +#!/bin/sh + +exec pytest diff --git a/tests/CORONET_Global_Topology.xls b/tests/CORONET_Global_Topology.xls new file mode 100644 index 0000000000000000000000000000000000000000..952d008b8a367d546300226d3a60024fb1dbd838 GIT binary patch literal 48128 zcmeHw2Ygjkw)ehignB5Uw@W9~kkBEd($h#n49C>J`$GK91$)qHMAE|2D$@27ijse0={o(z^ry%4WEJ3_WFNF1MQ=s zA)_M2r2&6v_mXgkC}`x5M3{IW;w-!i@iC+VQ7t+Ok?M2Fo_x8+?e#hT+h3_9gX};V z>OiJMM+8V0CXPbtBKneS-RZptz28rqPttp$=q|nyuZc~wH;tbTn5tdAR*V6k? zdhY`74)G|Jd50*I#31n=@JEa5u(QL>+d0yNEZo8+iiHo}|4(u_K#nI-0smn+DjW_m z-GWi2)hFpiaA8R;MwS<(Pe0jyad%aEK&}KCF^D#N^9x z2;gYGe>g<@%VKo63`UsfeHjh`ce$J#4cnXQL4zU&h)B4H7&?6DuyMnN#TCZRDj2P0 z3StLE3<2*y!1VpohS�yb~qKt8B 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 literal 0 HcmV?d00001 diff --git a/tests/parsers_test.py b/tests/parsers_test.py index 156edfc5..a5c69505 100644 --- a/tests/parsers_test.py +++ b/tests/parsers_test.py @@ -15,7 +15,8 @@ from examples.compare_json import compare_network_file, compare_service_file, co from gnpy.core.convert import convert_file from examples.convert_service_sheet import convert_service_sheet from pathlib import Path -import filecmp +import filecmp +from os import unlink network_file_name = 'tests/test_network.json' @@ -23,30 +24,32 @@ eqpt_library_name = 'examples/eqpt_config.json' # adding tests to check the parser non regression # convention of naming of test files: -# +# # - ..._expected.json for the reference output excel_filename = ['tests/excelTestFile.xls', - 'examples/CORONET_Global_Topology.xls', + 'tests/CORONET_Global_Topology.xls', 'tests/meshTopologyExampleV2.xls', 'tests/meshTopologyExampleV2Eqpt.xls'] network_test_filenames = { 'tests/excelTestFile.xls' : 'tests/excelTestFile_expected.json', - 'examples/CORONET_Global_Topology.xls': 'tests/CORONET_Global_Topology_expected.json', + 'tests/CORONET_Global_Topology.xls' : 'tests/CORONET_Global_Topology_expected.json', 'tests/meshTopologyExampleV2.xls' : 'tests/meshTopologyExampleV2_expected.json', 'tests/meshTopologyExampleV2Eqpt.xls' : 'tests/meshTopologyExampleV2Eqpt_expected.json'} @pytest.mark.parametrize("inputfile",excel_filename) def test_excel_json_generation(inputfile) : - convert_file(Path(inputfile)) + convert_file(Path(inputfile)) # actual json_filename = f'{inputfile[:-3]}json' # expected expected_filename = network_test_filenames[inputfile] - - assert compare_network_file(expected_filename,json_filename)[0] is True + + result, _ = compare_network_file(expected_filename, json_filename) + unlink(json_filename) + assert result # assume json entries -# test that the build network gives correct results +# test that the build network gives correct results # TODO !! excel_filename = ['tests/excelTestFile.xls', @@ -58,10 +61,12 @@ service_test_filenames = { 'tests/meshTopologyExampleV2Eqpt.xls' : 'tests/meshTopologyExampleV2Eqpt_services_expected.json'} @pytest.mark.parametrize("inputfile",excel_filename) def test_excel_service_json_generation(inputfile) : - convert_service_sheet(Path(inputfile),eqpt_library_name) + convert_service_sheet(Path(inputfile),eqpt_library_name) # actual json_filename = f'{inputfile[:-4]}_services.json' # expected test_filename = service_test_filenames[inputfile] - - assert compare_service_file(test_filename,json_filename)[0] is True \ No newline at end of file + + result, _ = compare_service_file(test_filename, json_filename) + unlink(json_filename) + assert result