Force the use of python3 in all acceptance tests

mthaddon · Jan 13, 2021 · 85c6175 · 85c6175
1 parent 8d827b1
commit 85c6175
Show file tree

Hide file tree

Showing 49 changed files with 52 additions and 52 deletions.
diff --git a/acceptancetests/assess b/acceptancetests/assess
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 # create_juju_test_env is a developer-centric tool. It creates an environment for running
 # acceptance tests locally under LXD.

diff --git a/acceptancetests/assess_add_cloud.py b/acceptancetests/assess_add_cloud.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 import logging
 import re

diff --git a/acceptancetests/assess_add_credentials.py b/acceptancetests/assess_add_credentials.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess proper functionality of juju add-credential."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_agent_metadata.py b/acceptancetests/assess_agent_metadata.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
  Juju agent-metadata-url validation on passing as an argument during
  juju bootstrap

diff --git a/acceptancetests/assess_autoload_credentials.py b/acceptancetests/assess_autoload_credentials.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Tests for the autoload-credentials command."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_block.py b/acceptancetests/assess_block.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess juju blocks prevent users from making changes and models"""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_bootstrap.py b/acceptancetests/assess_bootstrap.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 from argparse import ArgumentParser

diff --git a/acceptancetests/assess_cloud.py b/acceptancetests/assess_cloud.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from argparse import ArgumentParser
 import logging
 from textwrap import dedent

diff --git a/acceptancetests/assess_cloud_display.py b/acceptancetests/assess_cloud_display.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

diff --git a/acceptancetests/assess_constraints.py b/acceptancetests/assess_constraints.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """This module tests the deployment with constraints."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_container_networking.py b/acceptancetests/assess_container_networking.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 from argparse import ArgumentParser
 import contextlib
@@ -121,7 +121,7 @@ def make_machines(client, container_types, space):
     sargs = []
     if space:
         sargs = ['--constraints', 'spaces=' + space]
-         
+
     for host, containers in required.iteritems():
         for container in containers:
             client.juju('add-machine', tuple(['{}:{}'.format(container, host)] + sargs))

diff --git a/acceptancetests/assess_cross_model_relations.py b/acceptancetests/assess_cross_model_relations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Functional tests for Cross Model Relation (CMR) functionality.
 
 This test exercises the CMR Juju functionality which allows applications to

diff --git a/acceptancetests/assess_destroy_model.py b/acceptancetests/assess_destroy_model.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess if Juju tracks the model when the current model is destroyed."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_endpoint_bindings.py b/acceptancetests/assess_endpoint_bindings.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Validate endpoint bindings functionality on MAAS."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_heterogeneous_control.py b/acceptancetests/assess_heterogeneous_control.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from argparse import ArgumentParser
 from contextlib import contextmanager

diff --git a/acceptancetests/assess_juju_output.py b/acceptancetests/assess_juju_output.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
     Deploy a charm and subordinate charm and verify juju-status attribute of
     the deployed charms.

diff --git a/acceptancetests/assess_juju_sync_tools.py b/acceptancetests/assess_juju_sync_tools.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

diff --git a/acceptancetests/assess_log_forward.py b/acceptancetests/assess_log_forward.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Test Juju's log forwarding feature.
 
 Log forwarding allows a controller to forward syslog from all models of a

diff --git a/acceptancetests/assess_log_rotation.py b/acceptancetests/assess_log_rotation.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 from argparse import ArgumentParser

diff --git a/acceptancetests/assess_min_version.py b/acceptancetests/assess_min_version.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 import argparse

diff --git a/acceptancetests/assess_mixed_images.py b/acceptancetests/assess_mixed_images.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess mixed deployment of images from two sets of simplestreams."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_model_config_tree.py b/acceptancetests/assess_model_config_tree.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Test Model Tree Config functionality.
 
 Tests that default values can be overwritten and then unset.

diff --git a/acceptancetests/assess_model_defaults.py b/acceptancetests/assess_model_defaults.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess the model-defaults command."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_model_migration.py b/acceptancetests/assess_model_migration.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Tests for the Model Migration feature"""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_model_migration_versions.py b/acceptancetests/assess_model_migration_versions.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Test migrating models between controllers of increasing versions."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_multi_series_charms.py b/acceptancetests/assess_multi_series_charms.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 Charms have the capability to declare that they support more than
 one series. Previously a separate copy of the charm was required for

diff --git a/acceptancetests/assess_multimodel.py b/acceptancetests/assess_multimodel.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess multimodel support."""
 
 from argparse import ArgumentParser

diff --git a/acceptancetests/assess_network_health.py b/acceptancetests/assess_network_health.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess network health for a given deployment or bundle"""
 from __future__ import print_function
 

diff --git a/acceptancetests/assess_network_spaces.py b/acceptancetests/assess_network_spaces.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess network spaces for supported providers (currently only EC2)"""
 
 import argparse

diff --git a/acceptancetests/assess_persistent_storage.py b/acceptancetests/assess_persistent_storage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Testing Juju's persistent storage feature."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_primary_sub_relations.py b/acceptancetests/assess_primary_sub_relations.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Test relations between primary and subordinates are cleanedup correctly"""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_proxy.py b/acceptancetests/assess_proxy.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess Juju under various proxy network conditions.
 
 This test is dangerous to run on your own host. It will change the host's

diff --git a/acceptancetests/assess_recovery.py b/acceptancetests/assess_recovery.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 # Backup and restore a stack.
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_resolve.py b/acceptancetests/assess_resolve.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ Ensure resolve command resolves hook issues.
 
 This test covers the resolve command (and the option --no-retry)

diff --git a/acceptancetests/assess_resources.py b/acceptancetests/assess_resources.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 from __future__ import print_function
 

diff --git a/acceptancetests/assess_sla.py b/acceptancetests/assess_sla.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """This test will test the juju sla command. Currently, testing budget or
 supported sla models requires a functioning omnibus. As such, the current
 test merely checks to ensure unsupported models appear as unsupported"""

diff --git a/acceptancetests/assess_spaces_subnets.py b/acceptancetests/assess_spaces_subnets.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 from argparse import ArgumentParser
 import re

diff --git a/acceptancetests/assess_ssh_keys.py b/acceptancetests/assess_ssh_keys.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Validate ability of the user to import and remove ssh keys"""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_storage.py b/acceptancetests/assess_storage.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess juju charm storage."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_unregister.py b/acceptancetests/assess_unregister.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Tests for the unregister command
 
 Ensure that a users controller can be unregistered.

diff --git a/acceptancetests/assess_upgrade_lxd_profile.py b/acceptancetests/assess_upgrade_lxd_profile.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 
 """ Assess upgrading charms with lxd-profiles in different deployment scenarios.
 """
@@ -89,4 +89,4 @@ def main(argv=None):
         assess_profile_machines(client)
 
 if __name__ == '__main__':
-    sys.exit(main())
+    sys.exit(main())
diff --git a/acceptancetests/assess_upgrade_series.py b/acceptancetests/assess_upgrade_series.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Assess upgrading using the 'upgrade-series' commands."""
 
 from __future__ import print_function

diff --git a/acceptancetests/assess_user_grant_revoke.py b/acceptancetests/assess_user_grant_revoke.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """This testsuite is intended to test basic user permissions. Users
    can be granted read or full privileges by model. Revoking those
    privileges should remove them.

diff --git a/acceptancetests/assess_wallet.py b/acceptancetests/assess_wallet.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """
 This tests the wallet commands utilized for commercial charm billing.
 These commands are linked to a ubuntu sso account, and as such, require the

diff --git a/acceptancetests/deploy_job.py b/acceptancetests/deploy_job.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from deploy_stack import deploy_job
 if __name__ == '__main__':
     deploy_job()
diff --git a/acceptancetests/deploy_stack.py b/acceptancetests/deploy_stack.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 from __future__ import print_function
 
 from argparse import ArgumentParser
@@ -874,7 +874,7 @@ def from_client_existing(cls, args, client, existing_controller):
         controller_strategy = ExistingController(client)
         return cls(
             args.temp_env_name, client, client, args.bootstrap_host,
-            args.machine, args.series, args.arch, args.agent_url, 
+            args.machine, args.series, args.arch, args.agent_url,
             args.agent_stream, args.region, args.logs, args.keep_env,
             controller_strategy=controller_strategy,
             existing_controller=existing_controller)

diff --git a/acceptancetests/jujupy/timeout.py b/acceptancetests/jujupy/timeout.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 #
 # This file is part of JujuPy, a library for driving the Juju CLI.
 # Copyright 2015, 2017 Canonical Ltd.

diff --git a/acceptancetests/log_check.py b/acceptancetests/log_check.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """Simple looped check over provided file for regex content."""
 from __future__ import print_function
 

diff --git a/acceptancetests/template_assess.py.tmpl b/acceptancetests/template_assess.py.tmpl
@@ -1,4 +1,4 @@
-#!/usr/bin/env python
+#!/usr/bin/env python3
 """ TODO: Single line description of this assess script purpose.
 
 TODO: add description For: