Merge pull request #54642 from garethgreenaway/2019_2_1_port_50938

[master] Porting #50938 to master

salt/modules/opkg.py

@@ -1462,3 +1462,21 @@ def owner(*paths, **kwargs):  # pylint: disable=unused-argument
     if len(ret) == 1:
         return next(six.itervalues(ret))
     return ret
+
+
+def version_clean(version):
+    '''
+    Clean the version string removing extra data.
+    There's nothing do to here for nipkg.py, therefore it will always
+    return the given version.
+    '''
+    return version
+
+
+def check_extra_requirements(pkgname, pkgver):
+    '''
+    Check if the installed package already has the given requirements.
+    There's nothing do to here for nipkg.py, therefore it will always
+    return True.
+    '''
+    return True

tests/unit/modules/test_opkg.py

@@ -207,3 +207,15 @@ def test_info_installed(self):
         mock = MagicMock(return_value=ret_value)
         with patch.dict(opkg.__salt__, {'cmd.run_all': mock}):
             self.assertEqual(opkg.info_installed('vim'), expected_dict)
+
+    def test_version_clean(self):
+        '''
+        Test - Return the information of version_clean
+        '''
+        self.assertEqual(opkg.version_clean('1.0.1'), '1.0.1')
+
+    def test_check_extra_requirements(self):
+        '''
+        Test - Return the information of check_extra_requirements
+        '''
+        self.assertEqual(opkg.check_extra_requirements('vim', '1.0.1'), True)