diff options
| author | Łukasz 'sil2100' Zemczak <lukasz.zemczak@ubuntu.com> | 2018-02-15 14:28:59 +0100 |
|---|---|---|
| committer | usd-importer <ubuntu-server@lists.ubuntu.com> | 2018-02-15 19:08:29 +0000 |
| commit | d885152bedbdd289f7d6a3d24ab875fd4393bdff (patch) | |
| tree | 02695107ec9b72658266399201bde17f806601cf /tests/protocol | |
| parent | bdfe3a4fa9bd487ec5f40e829742e127476d2c8a (diff) | |
| download | vyos-walinuxagent-d885152bedbdd289f7d6a3d24ab875fd4393bdff.tar.gz vyos-walinuxagent-d885152bedbdd289f7d6a3d24ab875fd4393bdff.zip | |
Import patches-unapplied version 2.2.21+really2.2.20-0ubuntu1~16.04.1 to ubuntu/xenial-proposed
Imported using git-ubuntu import.
Changelog parent: bdfe3a4fa9bd487ec5f40e829742e127476d2c8a
New changelog entries:
* Backport bionic version to xenial.
* Revert to an older upstream release: 2.2.20 (LP: #1749589).
- Rename upstream tarball to 2.2.21+really2.2.20 to end up with a
temporarily higher version number than what's in the archive.
* debian/patches/disable_import_test.patch: refreshed patch.
Diffstat (limited to 'tests/protocol')
| -rw-r--r-- | tests/protocol/test_metadata.py | 2 | ||||
| -rw-r--r-- | tests/protocol/test_wire.py | 4 |
2 files changed, 2 insertions, 4 deletions
diff --git a/tests/protocol/test_metadata.py b/tests/protocol/test_metadata.py index 5f90f12..5047b86 100644 --- a/tests/protocol/test_metadata.py +++ b/tests/protocol/test_metadata.py @@ -39,7 +39,7 @@ class TestMetadataProtocolGetters(AgentTestCase): protocol.get_certs() ext_handlers, etag = protocol.get_ext_handlers() for ext_handler in ext_handlers.extHandlers: - protocol.get_ext_handler_pkgs(ext_handler, etag) + protocol.get_ext_handler_pkgs(ext_handler) def test_getters(self, *args): test_data = MetadataProtocolData(DATA_FILE) diff --git a/tests/protocol/test_wire.py b/tests/protocol/test_wire.py index 9e475ec..77a0882 100644 --- a/tests/protocol/test_wire.py +++ b/tests/protocol/test_wire.py @@ -43,9 +43,8 @@ class TestWireProtocol(AgentTestCase): protocol.get_vminfo() protocol.get_certs() ext_handlers, etag = protocol.get_ext_handlers() - self.assertEqual("1", etag) for ext_handler in ext_handlers.extHandlers: - protocol.get_ext_handler_pkgs(ext_handler, etag) + protocol.get_ext_handler_pkgs(ext_handler) crt1 = os.path.join(self.tmp_dir, '33B0ABCE4673538650971C10F7D7397E71561F35.crt') @@ -94,7 +93,6 @@ class TestWireProtocol(AgentTestCase): # HostingEnvironmentConfig, will be retrieved the expected number self.assertEqual(2, test_data.call_counts["hostingenvuri"]) - def test_call_storage_kwargs(self, mock_cryptutil, mock_sleep): |