From 1af1f2560e76a97be2271da110ec873578221f7d Mon Sep 17 00:00:00 2001 From: Takashi Kajinami Date: Tue, 8 Oct 2024 17:56:34 +0900 Subject: [PATCH] Drop unicode prefix from command output ... because it is not longer shown in Python 3. Change-Id: I126798422bcc3b78e1213865e0f23fef0b976fef (cherry picked from commit fc2f08cd45bbdd1b5f85f1faf6086cb8648e6ac3) (cherry picked from commit f6cd73780eb16938ae269ee42f65a2d6a9a9aeaa) --- .../provider/nova_aggregate/openstack_spec.rb | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/spec/unit/provider/nova_aggregate/openstack_spec.rb b/spec/unit/provider/nova_aggregate/openstack_spec.rb index a9fa8430a..e4e9466b4 100644 --- a/spec/unit/provider/nova_aggregate/openstack_spec.rb +++ b/spec/unit/provider/nova_aggregate/openstack_spec.rb @@ -65,7 +65,7 @@ hosts="[]" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" +properties="{\'nice\': \'cookie\'}" hosts="[]" ') expect(described_class).to receive(:openstack) @@ -73,8 +73,8 @@ hosts="[]" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" -hosts="[u\'example\']" +properties="{\'nice\': \'cookie\'}" +hosts="[\'example\']" ') provider.create @@ -164,7 +164,7 @@ hosts="[u\'example\']" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" +properties="{\'nice\': \'cookie\'}" hosts="[]" ') @@ -174,8 +174,8 @@ hosts="[]" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" -hosts="[u\'known\']" +properties="{\'nice\': \'cookie\'}" +hosts="[\'known\']" ') expect(described_class).to receive(:openstack) @@ -184,8 +184,8 @@ hosts="[u\'known\']" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" -hosts="[u\'known\', u\'known_too\']" +properties="{\'nice\': \'cookie\'}" +hosts="[\'known\', \'known_too\']" ') expect(described_class).to receive(:openstack) @@ -194,8 +194,8 @@ hosts="[u\'known\', u\'known_too\']" .and_return('name="just" id="just" availability_zone="simple" -properties="{u\'nice\': u\'cookie\'}" -hosts="[u\'known_too\']" +properties="{\'nice\': \'cookie\'}" +hosts="[\'known_too\']" ') # this creates a provider with the attributes defined above as 'aggregate_attrs'