Attachment 826698 Details for Bug 1024499 – patch to add tags for network, usb, and wlan

[patch] patch to add tags for network, usb, and wlan

0001-1024499-FEAT-Test-tags-should-be-added-for-new-speci.patch (text/plain), 3.67 KB, created by Greg Nichols on 2013-11-20 15:15:35 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Greg Nichols

Created: 2013-11-20 15:15:35 UTC

Size: 3.67 KB

patch

obsolete

>From b9326032ace4a44d4f14f38cdd5ea2bafa75dd45 Mon Sep 17 00:00:00 2001
>From: Greg Nichols <gnichols@redhat.com>
>Date: Wed, 20 Nov 2013 10:11:02 -0500
>Subject: [PATCH] 1024499 - FEAT: Test tags should be added for new
> specifically-named tests
>
>---
> Makefile              |  2 +-
> hwcert/networkTest.py |  2 +-
> hwcert/tags.py        |  9 +++++----
> hwcert/usbTest.py     | 11 +++++++----
> tests/wlan/wlan.py    |  2 +-
> 5 files changed, 15 insertions(+), 11 deletions(-)
>
>diff --git a/Makefile b/Makefile
>index 6bea75b..fbcd6ee 100644
>--- a/Makefile
>+++ b/Makefile
>@@ -15,7 +15,7 @@
> 
> TODAY = $(shell date +%Y%m%d)
> HWCERT_VERSION := 1.7.0
>-HWCERT_RELEASE := $(TODAY).1
>+HWCERT_RELEASE := $(TODAY)
> HWCERT_VERSION_RELEASE := $(HWCERT_VERSION)-$(HWCERT_RELEASE)
> HWCERT_VERSION_PY := hwcert/version.py
> HWCERT_RHEL_VERSION := 7
>diff --git a/hwcert/networkTest.py b/hwcert/networkTest.py
>index 4a82ebc..d0eaf19 100644
>--- a/hwcert/networkTest.py
>+++ b/hwcert/networkTest.py
>@@ -46,7 +46,7 @@ class NetworkTest(Test):
>         self.enforceSpeed = False
> 
>     def tags(self):
>-        return [TestTag.noninteractive, TestTag.certification]
>+        return [TestTag.noninteractive, TestTag.certification, TestTag.network]
> 
>     def getRequiredRPMs(self):
>         return ["ethtool"]
>diff --git a/hwcert/tags.py b/hwcert/tags.py
>index 320ca1c..4628d9a 100644
>--- a/hwcert/tags.py
>+++ b/hwcert/tags.py
>@@ -249,8 +249,6 @@ class PCIDeviceClass:
>     massStorage = 1
>     
> class TestTag:
>-    
>-    
>     interactive = "interactive"
>     noninteractive = "non-interactive"
>     certification = "certification"
>@@ -258,7 +256,10 @@ class TestTag:
>     portable = "portable"
>     virtualization="virtualization"
>     realtime="realtime"
>-    
>+    network="network"
>+    usb="usb"
>+    wlan="wlan"
>+
>     @staticmethod
>     def getAll():
>         tags = list()
>@@ -266,7 +267,7 @@ class TestTag:
>             if "_" not in key and "getAll" not in key:
>                 tags.append(vars(TestTag)[key])
>         return tags
>-    
>+
> class SystemCategories:
>     """ Hardware Catalog System Categories """
>     Server="Server"
>diff --git a/hwcert/usbTest.py b/hwcert/usbTest.py
>index 49f7be1..077fc9c 100644
>--- a/hwcert/usbTest.py
>+++ b/hwcert/usbTest.py
>@@ -23,20 +23,23 @@ import re
> import time
> import dbus
> 
>-from hwcert.tags import Constants, DeviceClass
>+from hwcert.tags import Constants, DeviceClass, TestTag
> from hwcert.test import Test
> from hwcert.device import Device
> from hwcert.command import Command
> from hwcert.udevDeviceDetector import UdevDeviceDetector
> 
> class USBTestBase(Test):
>-    
>+
>     def __init__(self, name):
>         Test.__init__(self, name)
>         self.pluggedInDevices = list()
>         self.deviceClass = DeviceClass.usb
>         self.deviceDetector = None
>-       
>+
>+    def tags(self):
>+        return [TestTag.interactive, TestTag.certification, TestTag.usb]
>+
>     def getUSBDevices(self):
>         ''' in fact, this function fetches all devices. '''
>         devices = list()
>@@ -45,7 +48,7 @@ class USBTestBase(Test):
>         devices = self.deviceDetector.getDevices()
> 
>         return devices
>-        
>+
>     def checkAllUSBPortsUnplugged(self):
>         devices = self.getUSBDevices()
>         if not devices:
>diff --git a/tests/wlan/wlan.py b/tests/wlan/wlan.py
>index 78c0f29..e71da6b 100644
>--- a/tests/wlan/wlan.py
>+++ b/tests/wlan/wlan.py
>@@ -40,7 +40,7 @@ class WLanTest(NetworkTest):
>         self.deviceClass = DeviceClass.network_interface
> 
>     def tags(self):
>-        return [TestTag.noninteractive, TestTag.certification]
>+        return [TestTag.noninteractive, TestTag.certification, TestTag.network, TestTag.wlan]
> 
>     def plan(self, planner):
>         # get the wireless device name
>-- 
>1.8.3.1
>

Actions: View | Diff

Attachments on bug 1024499: 826698