Cleanup bigtable python examples [(#2692)](GoogleCloudPlatform/python-docs-samples#2692)

billyjacobson · leahecole · web-flow · commit 605b69d6a98f · 2020-01-09T16:52:18.000-05:00
* Cleanup bigtable python:
Use new row types for mutations
Update bigtable version in requirements
Delete table after tests

* Change bigtable cluster variable to bigtable instance for consistency
Create and delete quickstart table during test

* Fixing step size for metric scaler
Create unique tables for quickstart tests

* Creating fixtures for quickstart tests
Fixing hb quickstart test output

* Fix quickstart extra delete table
Update happybase to use direct row

* Use clearer instance names for tests
Create unique instances for metric scaler tests

* Linting

* remove core dep

Co-authored-by: Leah E. Cole &lt;6719667+leahecole@users.noreply.github.com&gt;
diff --git a/samples/tableadmin/requirements.txt b/samples/tableadmin/requirements.txt
@@ -1 +1 @@
-google-cloud-bigtable==1.2.0
+google-cloud-bigtable==1.2.1
diff --git a/samples/tableadmin/tableadmin_test.py b/samples/tableadmin/tableadmin_test.py
@@ -21,16 +21,16 @@
 from tableadmin import run_table_operations
 
 PROJECT = os.environ['GCLOUD_PROJECT']
-BIGTABLE_CLUSTER = os.environ['BIGTABLE_CLUSTER']
-TABLE_NAME_FORMAT = 'hello-bigtable-system-tests-{}'
+BIGTABLE_INSTANCE = os.environ['BIGTABLE_INSTANCE']
+TABLE_NAME_FORMAT = 'tableadmin-test-{}'
 TABLE_NAME_RANGE = 10000
 
 
 def test_run_table_operations(capsys):
     table_name = TABLE_NAME_FORMAT.format(
         random.randrange(TABLE_NAME_RANGE))
 
-    run_table_operations(PROJECT, BIGTABLE_CLUSTER, table_name)
+    run_table_operations(PROJECT, BIGTABLE_INSTANCE, table_name)
     out, _ = capsys.readouterr()
 
     assert 'Creating the ' + table_name + ' table.' in out
@@ -50,13 +50,15 @@ def test_run_table_operations(capsys):
     assert 'Delete a column family cf2...' in out
     assert 'Column family cf2 deleted successfully.' in out
 
+    delete_table(PROJECT, BIGTABLE_INSTANCE, table_name)
+
 
 def test_delete_table(capsys):
     table_name = TABLE_NAME_FORMAT.format(
         random.randrange(TABLE_NAME_RANGE))
-    create_table(PROJECT, BIGTABLE_CLUSTER, table_name)
+    create_table(PROJECT, BIGTABLE_INSTANCE, table_name)
 
-    delete_table(PROJECT, BIGTABLE_CLUSTER, table_name)
+    delete_table(PROJECT, BIGTABLE_INSTANCE, table_name)
     out, _ = capsys.readouterr()
 
     assert 'Table ' + table_name + ' exists.' in out

Original file line number	Diff line number	Diff line change
`@@ -1 +1 @@`
`1`		`-google-cloud-bigtable==1.2.0`
	`1`	`+google-cloud-bigtable==1.2.1`