Improve pip test logs (#107)

jfrog · Sep 18, 2022 · cb5e553 · cb5e553
1 parent df8782d
commit cb5e553
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 10 deletions.
diff --git a/build/python_test.go b/build/python_test.go
@@ -56,13 +56,14 @@ func testGenerateBuildInfoForPython(t *testing.T, pythonTool pythonutils.PythonT
 	pythonModule.SetName(moduleName)
 	assert.NoError(t, pythonModule.RunInstallAndCollectDependencies(cmdArgs))
 	buildInfo, err := pythonBuild.ToBuildInfo()
-	assert.NoError(t, err)
-	// Verify results.
-	expectedBuildInfoJson := filepath.Join(projectPath, expectedResultsJson)
-	expectedBuildInfo := testdatautils.GetBuildInfo(t, expectedBuildInfoJson)
-	match, err := entities.IsEqualModuleSlices(buildInfo.Modules, expectedBuildInfo.Modules)
-	assert.NoError(t, err)
-	if !match {
-		testdatautils.PrintBuildInfoMismatch(t, expectedBuildInfo.Modules, buildInfo.Modules)
+	if assert.NoError(t, err) {
+		// Verify results.
+		expectedBuildInfoJson := filepath.Join(projectPath, expectedResultsJson)
+		expectedBuildInfo := testdatautils.GetBuildInfo(t, expectedBuildInfoJson)
+		match, err := entities.IsEqualModuleSlices(buildInfo.Modules, expectedBuildInfo.Modules)
+		assert.NoError(t, err)
+		if !match {
+			testdatautils.PrintBuildInfoMismatch(t, expectedBuildInfo.Modules, buildInfo.Modules)
+		}
 	}
 }
diff --git a/utils/pythonutils/piputils_test.go b/utils/pythonutils/piputils_test.go
@@ -50,8 +50,9 @@ func TestDetermineModuleName(t *testing.T) {
 
 			// Determine module name
 			packageName, err := getPackageNameFromSetuppy(tmpProjectPath)
-			assert.NoError(t, err)
-			assert.Equal(t, test.expectedPackageName, packageName)
+			if assert.NoError(t, err) {
+				assert.Equal(t, test.expectedPackageName, packageName)
+			}
 		})
 	}
 }