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.

1 files changed, 2 insertions, 4 deletions

diff --git a/tests/common/test_conf.py b/tests/common/test_conf.py
index 057c83b..a2c6573 100644
--- a/tests/common/test_conf.py
+++ b/tests/common/test_conf.py
@@ -65,7 +65,7 @@ class TestConf(AgentTestCase):
         "AutoUpdate.GAFamily" : "Prod",
         "EnableOverProvisioning" : False,
         "OS.AllowHTTP" : False,
-        "OS.EnableFirewall" : False
+        "OS.EnableFirewall" : True
     }
 
     def setUp(self):
@@ -78,7 +78,6 @@ class TestConf(AgentTestCase):
     def test_key_value_handling(self):
         self.assertEqual("Value1", self.conf.get("FauxKey1", "Bad"))
         self.assertEqual("Value2 Value2", self.conf.get("FauxKey2", "Bad"))
-        self.assertEqual("delalloc,rw,noatime,nobarrier,users,mode=777", self.conf.get("FauxKey3", "Bad"))
 
     def test_get_ssh_dir(self):
         self.assertTrue(get_ssh_dir(self.conf).startswith("/notareal/path"))
@@ -111,5 +110,4 @@ class TestConf(AgentTestCase):
         for k in TestConf.EXPECTED_CONFIGURATION.keys():
             self.assertEqual(
                 TestConf.EXPECTED_CONFIGURATION[k],
-                configuration[k],
-                k)
+                configuration[k])