update fixtures

django-daiquiri · Aug 28, 2017 · ed879ac · ed879ac
1 parent a121d14
commit ed879ac
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 12 deletions.
diff --git a/daiquiri/query/tests/test_viewsets.py b/daiquiri/query/tests/test_viewsets.py
@@ -2,7 +2,6 @@
 import mock
 
 from django.conf import settings
-from django.db import connections
 from django.test import TestCase
 
 from test_generator.viewsets import (
@@ -113,10 +112,10 @@ def _test_create_viewset(self, username):
         with mock.patch.object(adapter.database, 'execute') and \
             mock.patch.object(adapter.database, 'fetch_stats', return_value=(1,2)):
 
-            for instance in self.instances:
+            for example in Example.objects.all():
                 self.assert_create_viewset(username, data={
-                    'query_language': instance.query_language,
-                    'query': instance.query
+                    'query_language': example.query_language,
+                    'query': example.query
                 })
 
     def _test_update_viewset(self, username):

diff --git a/testing/fixtures/examples.json b/testing/fixtures/examples.json
@@ -7,7 +7,7 @@
       "name": "Select all stars from daiquiri_data_obs.stars",
       "description": "",
       "query_language": "mariadb-10.1",
-      "query_string": "SELECT `id`, `ra`, `de`, `parallax` FROM `daiquiri_data_obs`.`stars`",
+      "query_string": "SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars",
       "access_level": "PUBLIC",
       "groups": []
     }
@@ -20,7 +20,7 @@
       "name": "Select all particles from daiquiri_data_sim.particles",
       "description": "",
       "query_language": "mariadb-10.1",
-      "query_string": "SELECT `id`, `x`, `y`, `z`, `vx`, `vy`, `vz` FROM `daiquiri_data_sim`.`particles`",
+      "query_string": "SELECT id, x, y, z, vx, vy, vz FROM daiquiri_data_sim.particles",
       "access_level": "PUBLIC",
       "groups": []
     }

diff --git a/testing/fixtures/queryjobs.json b/testing/fixtures/queryjobs.json
@@ -6,9 +6,9 @@
       "database_name": "daiquiri_user_user",
       "table_name": "test",
       "query_language": "adql-2.0",
-      "query": "SELECT id, ra`, de, parallax FROM daiquiri_data_obs.stars",
-      "native_query": "SELECT `id`, `ra`, `de`, `parallax` FROM `daiquiri_data_obs`.`stars`",
-      "actual_query": "SET STATEMENT max_statement_time=30 FOR CREATE TABLE `daiquiri_user_user`.`test` ENGINE=ARIA ( SELECT `id`, `ra`, `de`, `parallax` FROM `daiquiri_data_obs`.`stars` );",
+      "query": "SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars",
+      "native_query": "SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars",
+      "actual_query": "SET STATEMENT max_statement_time=30 FOR CREATE TABLE daiquiri_user_user.test ENGINE=ARIA ( SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars );",
       "queue": "30s",
       "nrows": 10000,
       "size": 450560,
@@ -23,9 +23,9 @@
       "database_name": "daiquiri_user_user",
       "table_name": "test_executing",
       "query_language": "adql-2.0",
-      "query": "SELECT id, ra`, de, parallax FROM daiquiri_data_obs.stars",
-      "native_query": "SELECT `id`, `ra`, `de`, `parallax` FROM `daiquiri_data_obs`.`stars`",
-      "actual_query": "SET STATEMENT max_statement_time=30 FOR CREATE TABLE `daiquiri_user_user`.`test_executing` ENGINE=ARIA ( SELECT `id`, `ra`, `de`, `parallax` FROM `daiquiri_data_obs`.`stars` );",
+      "query": "SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars",
+      "native_query": "SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars",
+      "actual_query": "SET STATEMENT max_statement_time=30 FOR CREATE TABLE daiquiri_user_user.test_executing ENGINE=ARIA ( SELECT id, ra, de, parallax FROM daiquiri_data_obs.stars );",
       "queue": "30s",
       "nrows": 10000,
       "size": 450560,