Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/linters/.flake8
Original file line number Diff line number Diff line change
Expand Up @@ -16,4 +16,4 @@
# under the License.

[flake8]
select = W291,W293
select = W291,W292,W293
2 changes: 1 addition & 1 deletion api/test/integration/api/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# under the License.
2 changes: 1 addition & 1 deletion api/test/integration/api/test/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# under the License.
2 changes: 1 addition & 1 deletion api/test/integration/api/test/account/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -13,4 +13,4 @@
# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
# KIND, either express or implied. See the License for the
# specific language governing permissions and limitations
# under the License.
# under the License.
Original file line number Diff line number Diff line change
Expand Up @@ -94,4 +94,4 @@ def _loads(node):
def loads(xmlstr):
xmlstr = re.sub(r'xmlns=".*"', '', xmlstr)
root = etree.fromstring(xmlstr)
return _loads(root)
return _loads(root)
Original file line number Diff line number Diff line change
Expand Up @@ -51,4 +51,4 @@ def error(self, func, msg=None):
def warning(self, func, msg=None):
assert callable(func), "%s is not a function"%func
fmt = "[%s.%s]: "%(self.className, func.__name__)
self.logger.warning("%s%s"%(fmt,msg))
self.logger.warning("%s%s"%(fmt,msg))
Original file line number Diff line number Diff line change
Expand Up @@ -20,4 +20,4 @@
'''

class OvmObject(object):
pass
pass
2 changes: 1 addition & 1 deletion test/integration/broken/test_vpc_vm_life_cycle.py
Original file line number Diff line number Diff line change
Expand Up @@ -789,4 +789,4 @@ def test_10_expunge_instance_in_network(self):
id=self.lb_rule.id,
listall=True
)
return
return
2 changes: 1 addition & 1 deletion test/integration/smoke/test_annotations.py
Original file line number Diff line number Diff line change
Expand Up @@ -253,4 +253,4 @@ def test_06_add_adminsonly_and_update_annotation_visibility(self):

# Remove the annotation
self.removeAnnotation(annotation_id)
del self.added_annotations[-1]
del self.added_annotations[-1]
2 changes: 1 addition & 1 deletion test/integration/smoke/test_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -2043,4 +2043,4 @@ def test_03_destroySharedNetwork(self):
len(nic_ip_address),
0,
"Failed to find the placeholder IP"
)
)
2 changes: 1 addition & 1 deletion test/integration/smoke/test_persistent_network.py
Original file line number Diff line number Diff line change
Expand Up @@ -398,4 +398,4 @@ def validate_persistent_network_resources_created_on_host(self, network_vlan):
0,
"Failed to find bridge on the breth1-" + str(network_vlan))
elif self.hypervisor.lower() in ["xenserver", "vmware"]:
self.verify_network_setup_on_host_per_cluster(self.hypervisor.lower(), network_vlan)
self.verify_network_setup_on_host_per_cluster(self.hypervisor.lower(), network_vlan)
2 changes: 1 addition & 1 deletion test/integration/smoke/test_scale_vm.py
Original file line number Diff line number Diff line change
Expand Up @@ -480,4 +480,4 @@ def test_03_scale_vm(self):
else:
self.fail("Expected an exception to be thrown, failing")

return
return
2 changes: 1 addition & 1 deletion test/selenium/lib/initialize.py
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,4 @@ def getMSip():

for arg in sys.argv[1:]:
MS_ip = arg
return MS_ip
return MS_ip