alunduil 14/11/09 03:46:59
Added: 4453b4773688eef6c60736d9cf07100716308a5e.patch
0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
Log:
add version 1.39.1
(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key
11A8217C!)
Revision Changes Path
1.1
app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/openstack-guest-agents-unix/files/4453b4773688eef6c60736d9cf07100716308a5e.patch?rev=1.1&content-type=text/plain
Index: 4453b4773688eef6c60736d9cf07100716308a5e.patch
===================================================================
>From 4453b4773688eef6c60736d9cf07100716308a5e Mon Sep 17 00:00:00 2001
From: Nate House <[email protected]>
Date: Sun, 19 Oct 2014 15:49:35 -0500
Subject: [PATCH] Updated tests to check for either ifconfig/iproute2
---
tests/test_resetnetwork_interfaces.py | 13 ++++++++-----
1 file changed, 8 insertions(+), 5 deletions(-)
diff --git a/tests/test_resetnetwork_interfaces.py
b/tests/test_resetnetwork_interfaces.py
index f2b73bf..dc8e7e7 100644
--- a/tests/test_resetnetwork_interfaces.py
+++ b/tests/test_resetnetwork_interfaces.py
@@ -343,8 +343,8 @@ def test_gentoo_legacy_ipv4(self):
self.assertTrue('net' in outfiles)
generated = outfiles['net'].rstrip()
-
- pattern = ('modules=\( "ifconfig" \)\n*' +
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"192.0.2.42 netmask
255.255.255.0"\s*\)\n*' +
'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
@@ -371,8 +371,9 @@ def test_gentoo_legacy_ipv6(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules=\( "ifconfig" \)\n*' +
+ pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
@@ -399,8 +400,9 @@ def test_gentoo_openrc_ipv4(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules="ifconfig"\n*' +
+ pattern = ('modules="ifconfig|iproute2"\n*' +
'# Label public\n*' +
'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
'routes_eth0="\s*default via {gateway}\s*"\n*' +
@@ -429,8 +431,9 @@ def test_gentoo_openrc_ipv6(self):
self.assertTrue('net' in outfiles)
+ # (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules="ifconfig"\n*' +
+ pattern = ('modules="ifconfig|iproute2"\n*' +
'# Label public\n*' +
'config_eth0="\s*{ip}/{netmask_len}\s*"\n*' +
'routes_eth0="\s*default via {gateway}\s*"\n*' +
1.1
app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
file :
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch?rev=1.1&view=markup
plain:
http://sources.gentoo.org/viewvc.cgi/gentoo-x86/app-emulation/openstack-guest-agents-unix/files/0513f013625b6a652d7dcb663eb396b9b5bb924e.patch?rev=1.1&content-type=text/plain
Index: 0513f013625b6a652d7dcb663eb396b9b5bb924e.patch
===================================================================
>From 84e1a32ee2b8d0607f2868365aa46aaea58f014c Mon Sep 17 00:00:00 2001
From: Nate House <[email protected]>
Date: Mon, 20 Oct 2014 18:50:52 -0500
Subject: [PATCH] Updated regexp to work with config headers added sometime ago
---
tests/test_resetnetwork_interfaces.py | 26 +++++++++++---------------
1 file changed, 11 insertions(+), 15 deletions(-)
diff --git a/tests/test_resetnetwork_interfaces.py
b/tests/test_resetnetwork_interfaces.py
index dc8e7e7..b12b84c 100644
--- a/tests/test_resetnetwork_interfaces.py
+++ b/tests/test_resetnetwork_interfaces.py
@@ -344,17 +344,13 @@ def test_gentoo_legacy_ipv4(self):
generated = outfiles['net'].rstrip()
# (todo: naterh) Update tests to mock for both ifconfig/iproute2
- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
+ # (todo: naterh) Remove excessive unused kwargs
+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"192.0.2.42 netmask
255.255.255.0"\s*\)\n*' +
'routes_eth0=\(\s*"default via 192.0.2.1"\s*\)\n*' +
- 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)').format(
- ip=interface['ipv4'][0][0],
- netmask=interface['ipv4'][0][1],
- gateway=interface['gateway4'],
- dns=interface['dns'][0]
- )
- expected_regex = re.compile(pattern, re.MULTILINE)
+ 'dns_servers_eth0=\(\s*"192.0.2.2"\s*\)')
+ expected_regex = re.compile(pattern, re.DOTALL)
self.assertRegexpMatches(generated, expected_regex)
@@ -373,17 +369,17 @@ def test_gentoo_legacy_ipv6(self):
# (todo: naterh) Update tests to mock for both ifconfig/iproute2
generated = outfiles['net'].rstrip()
- pattern = ('modules=\( "ifconfig|iproute2" \)\n*' +
+ pattern = ('.*?modules="(ifconfig|iproute2)"\n*' +
'# Label public\n*' +
'config_eth0=\(\s*"{ip}/{netmask_len}"\s*\)\n*' +
'routes_eth0=\(\s*"default via {gateway}"\s*\)\n*' +
'dns_servers_eth0=\(\s*"{dns}"\s*\)').format(
- ip=interface['ipv6'][0][0],
- netmask_len=interface['ipv6'][0][1],
- gateway=interface['gateway6'],
- dns=interface['dns'][0]
- )
- expected_regex = re.compile(pattern, re.MULTILINE)
+ ip=interface['ipv6'][0][0],
+ netmask_len=interface['ipv6'][0][1],
+ gateway=interface['gateway6'],
+ dns=interface['dns'][0]
+ )
+ expected_regex = re.compile(pattern, re.DOTALL)
self.assertRegexpMatches(generated, expected_regex)
