Merge branch 'development'
diff --git a/.travis.yml b/.travis.yml
index ed5d273..a3dc911 100644
--- a/.travis.yml
+++ b/.travis.yml
@@ -6,8 +6,8 @@
- 3.3
- 3.4
- 3.5
+- 3.6
- pypy
-- pypy3
os:
- linux
install:
diff --git a/CONTRIB.md b/CONTRIB.md
index ae125ec..85598c7 100644
--- a/CONTRIB.md
+++ b/CONTRIB.md
@@ -9,11 +9,11 @@
(CLA).
* If you are an individual writing original source code and you're sure you
- own the intellectual property, then you'll need to sign an [individual CLA]
- (https://developers.google.com/open-source/cla/individual).
+ own the intellectual property, then you'll need to sign an
+ [individual CLA](https://developers.google.com/open-source/cla/individual).
* If you work for a company that wants to allow you to contribute your work,
- then you'll need to sign a [corporate CLA]
- (https://developers.google.com/open-source/cla/corporate).
+ then you'll need to sign a
+ [corporate CLA](https://developers.google.com/open-source/cla/corporate).
Follow either of the two links above to access the appropriate CLA and
instructions for how to sign and return it. Once we receive it, we'll be able to
@@ -28,9 +28,8 @@
1. Fork the desired repo, develop and test your code changes.
1. Ensure that your code adheres to the existing style in the sample to which
you are contributing. Refer to the
- [Google Cloud Platform Samples Style Guide]
- (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
- recommended coding standards for this organization.
+ [Google Cloud Platform Samples Style Guide](https://github.com/GoogleCloudPlatform/Template/wiki/style.html)
+ for the recommended coding standards for this organization.
1. Ensure that your code has an appropriate set of unit tests which all pass.
1. Submit a pull request.
@@ -56,9 +55,8 @@
GoogleCloudPlatform/Template repo.
1. Ensure that your code adheres to the existing style in the sample to which
you are contributing. Refer to the
- [Google Cloud Platform Samples Style Guide]
- (https://github.com/GoogleCloudPlatform/Template/wiki/style.html) for the
- recommended coding standards for this organization.
+ [Google Cloud Platform Samples Style Guide](https://github.com/GoogleCloudPlatform/Template/wiki/style.html)
+ for the recommended coding standards for this organization.
1. Ensure that your code has an appropriate set of unit tests which all pass.
1. Submit a request to fork your repo in GoogleCloudPlatform organization via
your proposal issue.
diff --git a/google_compute_engine/accounts/accounts_daemon.py b/google_compute_engine/accounts/accounts_daemon.py
index 32a4358..c1a7e5f 100755
--- a/google_compute_engine/accounts/accounts_daemon.py
+++ b/google_compute_engine/accounts/accounts_daemon.py
@@ -196,6 +196,7 @@
"""
for username in remove_users:
self.utils.RemoveUser(username)
+ self.user_ssh_keys.pop(username, None)
self.invalid_users -= set(remove_users)
def HandleAccounts(self, result):
diff --git a/google_compute_engine/accounts/tests/accounts_daemon_test.py b/google_compute_engine/accounts/tests/accounts_daemon_test.py
index 22edebf..805c3f7 100644
--- a/google_compute_engine/accounts/tests/accounts_daemon_test.py
+++ b/google_compute_engine/accounts/tests/accounts_daemon_test.py
@@ -293,6 +293,12 @@
def testRemoveUsers(self):
remove_users = ['a', 'b', 'c', 'valid']
+ self.mock_setup.user_ssh_keys = {
+ 'a': ['1'],
+ 'b': ['2'],
+ 'c': ['3'],
+ 'invalid': ['key'],
+ }
self.mock_setup.invalid_users = set(['invalid', 'a', 'b', 'c'])
accounts_daemon.AccountsDaemon._RemoveUsers(self.mock_setup, remove_users)
expected_calls = [
@@ -303,6 +309,7 @@
]
self.mock_utils.RemoveUser.assert_has_calls(expected_calls)
self.assertEqual(self.mock_setup.invalid_users, set(['invalid']))
+ self.assertEqual(self.mock_setup.user_ssh_keys, {'invalid': ['key']})
def testHandleAccounts(self):
configured = ['c', 'c', 'b', 'b', 'a', 'a']
diff --git a/setup.py b/setup.py
index 652a7a1..183eec1 100755
--- a/setup.py
+++ b/setup.py
@@ -32,7 +32,7 @@
packages=setuptools.find_packages(),
scripts=glob.glob('scripts/*'),
url='https://github.com/GoogleCloudPlatform/compute-image-packages',
- version='2.3.6',
+ version='2.3.7',
# Entry points create scripts in /usr/bin that call a function.
entry_points={
'console_scripts': [
