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

[beeswax] Update tests for new get_sample_data API endpoint

Jenny Kim 10 жил өмнө
parent
commit
762fcde

+ 5 - 6
apps/beeswax/src/beeswax/tests.py

@@ -1473,7 +1473,6 @@ for x in sys.stdin:
     cols = resp.context['table'].cols
     assert_equal(len(cols), 3)
     assert_equal([ col.name for col in cols ], [ 'col_a', 'col_b', 'col_c' ])
-    assert_equal([['ta\tb', 'nada', 'sp ace'], ['f\too', 'bar', 'fred'], ['a\ta', 'bb', 'cc']], resp.context['sample_rows'])
     assert_true("nada" in resp.content, resp.content)
     assert_true("sp ace" in resp.content, resp.content)
 
@@ -1645,11 +1644,11 @@ for x in sys.stdin:
   def test_get_table_sample(self):
     client = make_logged_in_client()
 
-    resp = client.get(reverse('beeswax:describe_table', kwargs={'database': self.db_name, 'table': 'test'}) + '?sample=true')
-
-    assert_equal(resp.status_code, 200)
-    assert_true('<th>test.foo</th>' in resp.content, resp.content)
-    assert_true([0, '0x0'] in resp.context['sample_rows'], resp.context['sample_rows'])
+    resp = client.get(reverse('beeswax:get_sample_data', kwargs={'database': self.db_name, 'table': 'test'}))
+    json_resp = json.loads(resp.content)
+    assert_equal(0, json_resp['status'], json_resp)
+    assert_true('test.foo' in json_resp['headers'], json_resp)
+    assert_true([0, '0x0'] in json_resp['rows'], json_resp)
 
 
   def test_get_sample_partitioned(self):

+ 0 - 7
apps/metastore/src/metastore/tests.py

@@ -156,13 +156,6 @@ class TestMetastoreWithHadoop(BeeswaxSampleProvider):
     assert_true(self.db_name in resp.content)
     assert_true("myview" in resp.content)
 
-  def test_get_sample_data(self):
-    resp = self.client.get("/metastore/table/%s/test_partitions/sample" % self.db_name)
-    json_resp = json.loads(resp.content)
-    assert_equal(0, json_resp['status'], json_resp)
-    assert_true('headers' in json_resp, json_resp)
-    assert_true('rows' in json_resp, json_resp)
-
   def test_describe_partitions(self):
     response = self.client.get("/metastore/table/%s/test_partitions" % self.db_name)
     assert_true("Show Partitions (2)" in response.content, response.content)

+ 0 - 1
apps/metastore/src/metastore/urls.py

@@ -28,7 +28,6 @@ urlpatterns = patterns('metastore.views',
   url(r'^tables/drop/(?P<database>\w+)$', 'drop_table', name='drop_table'),
   url(r'^table/(?P<database>\w+)/(?P<table>\w+)$', 'describe_table', name='describe_table'),
   url(r'^table/(?P<database>\w+)/(?P<table>\w+)/alter$', 'alter_table', name='alter_table'),
-  url(r'^table/(?P<database>\w+)/(?P<table>\w+)/sample$', 'get_sample_data', name='get_sample_data'),
   url(r'^table/(?P<database>\w+)/(?P<table>\w+)/metadata$', 'get_table_metadata', name='get_table_metadata'),
   url(r'^table/(?P<database>\w+)/(?P<table>\w+)/load$', 'load_table', name='load_table'),
   url(r'^table/(?P<database>\w+)/(?P<table>\w+)/read$', 'read_table', name='read_table'),