From a1145b5cbfc1db32d8dffb7ffaa1b1d18b843923 Mon Sep 17 00:00:00 2001 From: Luke Campagnola Date: Thu, 26 Apr 2018 14:43:20 -0700 Subject: [PATCH] Fix pytest assertion rewrite conflicting with reload by giving temporary module a different name --- .travis.yml | 2 +- pyqtgraph/tests/test_reload.py | 26 ++++++++++++++------------ 2 files changed, 15 insertions(+), 13 deletions(-) diff --git a/.travis.yml b/.travis.yml index 1c422f19..acfde8ec 100644 --- a/.travis.yml +++ b/.travis.yml @@ -143,7 +143,7 @@ script: # Run unit tests - start_test "unit tests"; - PYTHONPATH=. py.test --cov --assert=plain pyqtgraph -sv; + PYTHONPATH=. py.test --cov pyqtgraph -sv; check_output "unit tests"; - echo "test script finished. Current directory:" - pwd diff --git a/pyqtgraph/tests/test_reload.py b/pyqtgraph/tests/test_reload.py index b90072f1..6adbeeb6 100644 --- a/pyqtgraph/tests/test_reload.py +++ b/pyqtgraph/tests/test_reload.py @@ -45,29 +45,31 @@ def test_reload(): py3 = sys.version_info >= (3,) # write a module - mod = os.path.join(path, 'reload_test.py') - open(mod, 'w').write(code.format(path=path, msg="C.fn() Version1")) + mod = os.path.join(path, 'reload_test_mod.py') + print("\nRELOAD FILE:", mod) + open(mod, 'w').write(code.format(path=pgpath, msg="C.fn() Version1")) # import the new module - import reload_test + import reload_test_mod + print("RELOAD MOD:", reload_test_mod.__file__) - c = reload_test.C() + c = reload_test_mod.C() c.sig.connect(c.fn) if py3: - v1 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, c.sig, c.fn, c.fn.__func__) + v1 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, c.sig, c.fn, c.fn.__func__) else: - v1 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, reload_test.C.fn.__func__, c.sig, c.fn, c.fn.__func__) + v1 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, reload_test_mod.C.fn.__func__, c.sig, c.fn, c.fn.__func__) # write again and reload - open(mod, 'w').write(code.format(path=path, msg="C.fn() Version2")) + open(mod, 'w').write(code.format(path=pgpath, msg="C.fn() Version2")) remove_cache(mod) pg.reload.reloadAll(path, debug=True) if py3: - v2 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, c.sig, c.fn, c.fn.__func__) + v2 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, c.sig, c.fn, c.fn.__func__) else: - v2 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, reload_test.C.fn.__func__, c.sig, c.fn, c.fn.__func__) + v2 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, reload_test_mod.C.fn.__func__, c.sig, c.fn, c.fn.__func__) if not py3: assert c.fn.im_class is v2[0] @@ -85,13 +87,13 @@ def test_reload(): # write again and reload - open(mod, 'w').write(code.format(path=path, msg="C.fn() Version2")) + open(mod, 'w').write(code.format(path=pgpath, msg="C.fn() Version2")) remove_cache(mod) pg.reload.reloadAll(path, debug=True) if py3: - v3 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, c.sig, c.fn, c.fn.__func__) + v3 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, c.sig, c.fn, c.fn.__func__) else: - v3 = (reload_test.C, reload_test.C.sig, reload_test.C.fn, reload_test.C.fn.__func__, c.sig, c.fn, c.fn.__func__) + v3 = (reload_test_mod.C, reload_test_mod.C.sig, reload_test_mod.C.fn, reload_test_mod.C.fn.__func__, c.sig, c.fn, c.fn.__func__) #for i in range(len(old)): #print id(old[i]), id(new1[i]), id(new2[i]), old[i], new1[i]