Robert Brewer avatar Robert Brewer committed 4152a21

Removed dependency on pyconquer inside test_states.

Comments (0)

Files changed (1)

test/test_states.py

         cherrypy.engine.on_start_thread_list.append(db_connection.startthread)
         cherrypy.engine.on_stop_thread_list.append(db_connection.stopthread)
         
-        import pyconquer
-        tr = pyconquer.Logger("cherrypy")
-        tr.out = open(os.path.join(os.path.dirname(__file__), "state.log"), "wb")
         try:
-            tr.start()
+            import pyconquer
+        except ImportError:
             helper.CPTestRunner.run(suite)
-        finally:
-            tr.stop()
-            tr.out.close()
+        else:
+            tr = pyconquer.Logger("cherrypy")
+            tr.out = open(os.path.join(os.path.dirname(__file__), "state.log"), "wb")
+            try:
+                tr.start()
+                helper.CPTestRunner.run(suite)
+            finally:
+                tr.stop()
+                tr.out.close()
     finally:
         cherrypy.server.stop()
         cherrypy.engine.stop()
Tip: Filter by directory path e.g. /media app.js to search for public/media/app.js.
Tip: Use camelCasing e.g. ProjME to search for ProjectModifiedEvent.java.
Tip: Filter by extension type e.g. /repo .js to search for all .js files in the /repo directory.
Tip: Separate your search with spaces e.g. /ssh pom.xml to search for src/ssh/pom.xml.
Tip: Use ↑ and ↓ arrow keys to navigate and return to view the file.
Tip: You can also navigate files with Ctrl+j (next) and Ctrl+k (previous) and view the file with Ctrl+o.
Tip: You can also navigate files with Alt+j (next) and Alt+k (previous) and view the file with Alt+o.