Эх сурвалжийг харах

[beeswax] Fix non re-entrant test conflicting with desktop test

Romain Rigaux 10 жил өмнө
parent
commit
191ed4e

+ 1 - 1
apps/beeswax/src/beeswax/tests.py

@@ -903,7 +903,7 @@ for x in sys.stdin:
     # Delete a design
     resp = cli.get('/beeswax/delete_designs')
     assert_true('Delete design(s)' in resp.content, resp.content)
-    resp = cli.post('/beeswax/delete_designs', {u'designs_selection': [u'1']})
+    resp = cli.post('/beeswax/delete_designs', {u'designs_selection': [design.id]})
     assert_equal(resp.status_code, 302)
 
     # Delete designs

+ 14 - 11
desktop/core/src/desktop/tests_doc2.py

@@ -51,17 +51,20 @@ class TestDocument2(object):
         desc='Example of old format'
     )
 
-    new_query = import_saved_beeswax_query(old_query)
-    new_query_data = new_query.get_data()
+    try:
+      new_query = import_saved_beeswax_query(old_query)
+      new_query_data = new_query.get_data()
 
-    assert_equal('query-hive', new_query_data['type'])
-    assert_equal('See examples', new_query_data['name'])
-    assert_equal('Example of old format', new_query_data['description'])
+      assert_equal('query-hive', new_query_data['type'])
+      assert_equal('See examples', new_query_data['name'])
+      assert_equal('Example of old format', new_query_data['description'])
 
-    assert_equal('ready', new_query_data['snippets'][0]['status'])
-    assert_equal('See examples', new_query_data['snippets'][0]['name'])
-    assert_equal('SELECT * FROM sample_07', new_query_data['snippets'][0]['statement_raw'])
+      assert_equal('ready', new_query_data['snippets'][0]['status'])
+      assert_equal('See examples', new_query_data['snippets'][0]['name'])
+      assert_equal('SELECT * FROM sample_07', new_query_data['snippets'][0]['statement_raw'])
 
-    assert_equal([], new_query_data['snippets'][0]['properties']['settings'])
-    assert_equal([], new_query_data['snippets'][0]['properties']['files'])
-    assert_equal([], new_query_data['snippets'][0]['properties']['functions'])
+      assert_equal([], new_query_data['snippets'][0]['properties']['settings'])
+      assert_equal([], new_query_data['snippets'][0]['properties']['files'])
+      assert_equal([], new_query_data['snippets'][0]['properties']['functions'])
+    finally:
+      old_query.delete()