Fix failing testcases for PR #1043

tests/cli_tests/0_challenge_protocol_test.go

@@ -275,8 +275,8 @@ func TestProtocolChallenge(testSetup *testing.T) {
 }
 
 // Generate a random number in the range [0, max)
-func secureRandomInt(max int) (int64, error) {
-	n, err := rand.Int(rand.Reader, big.NewInt(int64(max)))
+func secureRandomInt(maxValue int) (int64, error) {
+	n, err := rand.Int(rand.Reader, big.NewInt(int64(maxValue)))
 	if err != nil {
 		return 0, err
 	}

tests/cli_tests/zboxcli_common_user_functions_test.go

@@ -174,6 +174,23 @@ func updateFileWithRandomlyGeneratedDataWithWallet(t *test.SystemTest, walletNam
 	return localfile
 }
 
+func updateFileContentWithRandomlyGeneratedData(t *test.SystemTest, allocationID, remotepath, filename string, size int64) string {
+	return updateFileContentWithRandomlyGeneratedDataWithWallet(t, escapedTestName(t), allocationID, remotepath, filename, size)
+}
+
+func updateFileContentWithRandomlyGeneratedDataWithWallet(t *test.SystemTest, walletName, allocationID, remotepath, filename string, size int64) string {
+	err := createFileWithSize(filename, size)
+	require.Nil(t, err)
+
+	output, err := updateFileWithWallet(t, walletName, configPath, map[string]interface{}{
+		"allocation": allocationID,
+		"remotepath": remotepath,
+		"localpath":  filename,
+	}, true)
+	require.Nil(t, err, strings.Join(output, "\n"))
+	return filename
+}
+
 func renameFile(t *test.SystemTest, cliConfigFilename string, param map[string]interface{}, retry bool) ([]string, error) {
 	t.Logf("Renaming file...")
 	p := createParams(param)

tests/cli_tests/zboxcli_file_upload_test.go

@@ -1034,6 +1034,26 @@ func generateFileAndUploadForWallet(t *test.SystemTest, wallet, allocationID, re
 	return filename
 }
 
+func generateFileContentAndUpload(t *test.SystemTest, allocationID, remotepath, filename string, size int64) string {
+	return generateFileContentAndUploadForWallet(t, escapedTestName(t), allocationID, remotepath, filename, size)
+}
+
+func generateFileContentAndUploadForWallet(t *test.SystemTest, wallet, allocationID, remotepath, filename string, size int64) string {
+	err := createFileWithSize(filename, size)
+	require.Nil(t, err)
+
+	// Upload parameters
+	// log command with allocation id, filename and remotepath
+	t.Logf("Uploading file %s to allocation %s with remotepath %s", filename, allocationID, remotepath+filepath.Base(filename))
+	uploadWithParamForWallet(t, wallet, configPath, map[string]interface{}{
+		"allocation": allocationID,
+		"localpath":  filename,
+		"remotepath": remotepath + filepath.Base(filename),
+	})
+
+	return filename
+}
+
 func generateFileAndUploadWithParam(t *test.SystemTest, allocationID, remotepath string, size int64, params map[string]interface{}) string {
 	filename := generateRandomTestFileName(t)