Fix error codes for install existing, update-check. Add tests for the…

… same
jsilhan · Jan 14, 2016 · 1557467 · 1557467
1 parent 85b89c3
commit 1557467
Show file tree

Hide file tree

Showing 5 changed files with 49 additions and 1 deletion.
diff --git a/client/api.c b/client/api.c
@@ -184,6 +184,10 @@ TDNFCheckUpdates(
                ppszPackageNameSpecs,
                ppPkgInfo,
                pdwCount);
+    if(dwError == ERROR_TDNF_NO_MATCH)
+    {
+        dwError = 0;
+    }
 
 cleanup:
     return dwError;

diff --git a/tests/install.at b/tests/install.at
@@ -21,6 +21,16 @@ TDNF_CLI_W_CHROOT install tdnf-test-one -y
 [ignore])
 AT_CLEANUP
 
+AT_SETUP([install existing])
+AT_KEYWORDS([install])
+AT_CHECK([
+TDNF_CLI_W_CHROOT install tdnf-test-one -y
+],
+[0],
+[ignore],
+[ignore])
+AT_CLEANUP
+
 AT_SETUP([install non existent])
 AT_KEYWORDS([install])
 AT_CHECK([

diff --git a/tests/testsuite.at b/tests/testsuite.at
@@ -10,3 +10,4 @@ m4_include([version.at])
 m4_include([list.at])
 m4_include([install.at])
 m4_include([erase.at])
+m4_include([update.at])
diff --git a/tests/update.at b/tests/update.at
@@ -0,0 +1,32 @@
+#
+# Copyright (C) 2015 VMware, Inc. All Rights Reserved.
+#
+# Licensed under the GNU Lesser General Public License v2.1 (the "License");
+# you may not use this file except in compliance with the License. The terms
+# of the License are located in the COPYING file of this distribution.
+#
+
+AT_BANNER(tdnf update tests)
+
+AT_SETUP([update check])
+AT_KEYWORDS([update])
+AT_CHECK([
+TDNF_CHROOT_CLEAN
+TDNF_CHROOT_INIT
+TDNF_BUILD_INSTALL_RPMS
+TDNF_CLI_W_CHROOT check-update
+],
+[0],
+[ignore],
+[ignore])
+AT_CLEANUP
+
+AT_SETUP([update all])
+AT_KEYWORDS([update])
+AT_CHECK([
+TDNF_CLI_W_CHROOT update -y
+],
+[0],
+[ignore],
+[ignore])
+AT_CLEANUP
diff --git a/tools/cli/installcmd.c b/tools/cli/installcmd.c
@@ -197,7 +197,8 @@ TDNFCliAlterCommand(
     {
         dwError = ERROR_TDNF_CLI_NOTHING_TO_DO;
         //If there are unresolved, error with no match
-        if(pSolvedPkgInfo->ppszPkgsNotResolved)
+        if(pSolvedPkgInfo->ppszPkgsNotResolved &&
+           *pSolvedPkgInfo->ppszPkgsNotResolved)
         {
             dwError = ERROR_TDNF_NO_MATCH;
         }