Address nywilken's review

* rename test
* test artifact cleanup
* during test, check expected migration path DNE before migration
* when checking solution files, check for a modern solution before
legacy

Author: jdsutherland

cmd/submit_test.go

@@ -261,7 +261,7 @@ func TestSubmitOnlyEmptyFile(t *testing.T) {
 	assert.Regexp(t, "No files found", err.Error())
 }
 
-func TestSubmitExerciseWithLegacySolutionMetadataFileAndGetsMigrated(t *testing.T) {
+func TestLegacySolutionMetadataMigration(t *testing.T) {
 	oldOut := Out
 	oldErr := Err
 	Out = ioutil.Discard
@@ -276,6 +276,7 @@ func TestSubmitExerciseWithLegacySolutionMetadataFileAndGetsMigrated(t *testing.
 	defer ts.Close()
 
 	tmpDir, err := ioutil.TempDir("", "legacy-metadata-file")
+	defer os.RemoveAll(tmpDir)
 	assert.NoError(t, err)
 
 	dir := filepath.Join(tmpDir, "bogus-track", "bogus-exercise")
@@ -296,6 +297,8 @@ func TestSubmitExerciseWithLegacySolutionMetadataFileAndGetsMigrated(t *testing.
 		UserViperConfig: v,
 	}
 	expectedSolutionPathAfterMigration := filepath.Join(dir, workspace.SolutionMetadataFilepath())
+	_, err = os.Stat(expectedSolutionPathAfterMigration)
+	assert.Error(t, err)
 
 	err = runSubmit(cfg, pflag.NewFlagSet("fake", pflag.PanicOnError), []string{file})
 	assert.NoError(t, err)

workspace/solution.go

@@ -60,19 +60,19 @@ func (s *Solution) String() string {
 }
 
 // Write stores solution metadata to a file.
-func (s *Solution) Write(path string) error {
+func (s *Solution) Write(dir string) error {
 	b, err := json.Marshal(s)
 	if err != nil {
 		return err
 	}
-	if err = createIgnoreSubdir(path); err != nil {
+	if err = createIgnoreSubdir(dir); err != nil {
 		return err
 	}
-	if err = ioutil.WriteFile(filepath.Join(path, SolutionMetadataFilepath()), b, os.FileMode(0600)); err != nil {
+	if err = ioutil.WriteFile(filepath.Join(dir, SolutionMetadataFilepath()), b, os.FileMode(0600)); err != nil {
 		return err
 	}
-	s.Dir = path
-	return err
+	s.Dir = dir
+	return nil
 }
 
 // PathToParent is the relative path from the workspace to the parent dir.

workspace/workspace.go

@@ -209,10 +209,11 @@ func checkSolutionFile(path string) error {
 	legacySolutionPath := filepath.Join(path, ".solution.json")
 	solutionPath := filepath.Join(path, SolutionMetadataFilepath())
 
-	if _, err := os.Lstat(legacySolutionPath); err == nil {
+	var err error
+	if _, err = os.Lstat(solutionPath); err == nil {
+		return nil
+	} else if _, err2 := os.Lstat(legacySolutionPath); err2 == nil {
 		return migrateLegacySolutionFile(legacySolutionPath, solutionPath)
-	} else if _, err := os.Lstat(solutionPath); err != nil {
-		return err
 	}
-	return nil
+	return err
 }