Skip to content
Merged
Show file tree
Hide file tree
Changes from 2 commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 34 additions & 6 deletions bigtable/nox.py
Original file line number Diff line number Diff line change
Expand Up @@ -98,27 +98,55 @@ def system(session, py):
session.run('py.test', '--quiet', 'tests/system.py', *session.posargs)


@nox.session
@nox.parametrize('py', ['2.7', '3.6'])
def snippets(session, py):
"""Run the system test suite."""

# Sanity check: Only run system tests if the environment variable is set.
if not os.environ.get('GOOGLE_APPLICATION_CREDENTIALS', ''):
session.skip('Credentials must be set via environment variable.')

# Run the system tests against latest Python 2 and Python 3 only.
session.interpreter = 'python{}'.format(py)

# Set the virtualenv dirname.
session.virtualenv_dirname = 'snip-' + py

# Install all test dependencies, then install local packages in place.
session.install('mock', 'pytest')
for local_dep in LOCAL_DEPS:
session.install('-e', local_dep)
session.install('-e', os.path.join('..', 'bigtable'))
session.install('-e', '.')

# Run py.test against the system tests.
session.run('py.test', os.path.join('../docs/bigtable', \
'snippets.py'), *session.posargs)



@nox.session
def lint(session):
"""Run linters.

This comment was marked as spam.

This comment was marked as spam.

Returns a failure if the linters find linting errors or sufficiently
serious code quality issues.
"""
session.interpreter = 'python3.6'
session.install('flake8', *LOCAL_DEPS)
session.install('.')
session.run('flake8', 'google', 'tests')


@nox.session
def lint_setup_py(session):
"""Verify that setup.py is valid (including RST check)."""
session.interpreter = 'python3.6'

# Set the virtualenv dirname.
session.virtualenv_dirname = 'setup'

session.install('docutils', 'Pygments')
session.run(
'python', 'setup.py', 'check', '--restructuredtext', '--strict')
Expand All @@ -127,7 +155,7 @@ def lint_setup_py(session):
@nox.session
def cover(session):
"""Run the final coverage report.

This outputs the coverage report aggregating coverage from the unit
test runs (not system test runs), and then erases coverage data.
"""
Expand Down
25 changes: 14 additions & 11 deletions docs/bigtable/snippets.py
Original file line number Diff line number Diff line change
Expand Up @@ -61,7 +61,7 @@ def bigtable_create_instance(client, to_delete):


@snippet
def bigtable_create_cluster(client):
def bigtable_create_cluster(client, to_delete):
# [START bigtable_create_cluster]
from google.cloud.bigtable import enums

Expand All @@ -78,30 +78,30 @@ def bigtable_create_cluster(client):


@snippet
def bigtable_list_instances(client):
def bigtable_list_instances(client, to_delete):
# [START bigtable_list_instances]
(instances_list, failed_locations_list) = client.list_instances()
# [END bigtable_list_instances]


@snippet
def bigtable_list_clusters(client):
def bigtable_list_clusters(client, to_delete):
# [START bigtable_list_clusters]
instance = client.instance("instance_my1")
(clusters_list, failed_locations_list) = instance.list_clusters()
# [END bigtable_list_clusters]


@snippet
def bigtable_instance_exists(client):
def bigtable_instance_exists(client, to_delete):
# [START bigtable_check_instance_exists]
instance = client.instance("instance_my1")
instance_exists = instance.exists()
# [END bigtable_check_instance_exists]


@snippet
def bigtable_cluster_exists(client):
def bigtable_cluster_exists(client, to_delete):
# [START bigtable_check_cluster_exists]
instance = client.instance("instance_my1")
cluster = instance.cluster("ssd-cluster1")
Expand All @@ -110,30 +110,33 @@ def bigtable_cluster_exists(client):


@snippet
def bigtable_delete_instance(client):
def bigtable_delete_instance(client, to_delete):
# [START bigtable_delete_instance]
instance = client.instance("instance_my1")
instance.delete()
# [END bigtable_delete_instance]


@snippet
def bigtable_delete_cluster(client):
def bigtable_delete_cluster(client, to_delete):
# [START bigtable_delete_cluster]
instance = client.instance("instance_my1")
cluster = instance.cluster("ssd-cluster1")
cluster.delete()
# [END bigtable_delete_cluster]


def bigtable_reload_cluster(client):
@snippet
def bigtable_reload_cluster(client, to_delete):
# [START bigtable_reload_cluster]
instance = client.instance("instance_my1")
cluster = instance.cluster("ssd-cluster1")
cluster.reload()
# [END bigtable_reload_cluster]

def bigtable_update_cluster(client):

@snippet
def bigtable_update_cluster(client, to_delete):
# [START bigtable_update_cluster]
instance = client.instance("instance_my1")
cluster = instance.cluster("ssd-cluster1")
Expand All @@ -143,7 +146,7 @@ def bigtable_update_cluster(client):


@snippet
def bigtable_create_table(client):
def bigtable_create_table(client, to_delete):
# [START bigtable_create_table]
from google.cloud.bigtable import column_family

Expand All @@ -157,7 +160,7 @@ def bigtable_create_table(client):


@snippet
def bigtable_list_tables(client):
def bigtable_list_tables(client, to_delete):
# [START bigtable_list_tables]
instance = client.instance("instance_my1")
tables_list = instance.list_tables()
Expand Down