Skip to content

Commit c1c9cd2

Browse files
mschenk42mschenk42
committed
Fix directory handling in test cases
1 parent b9f7e5d commit c1c9cd2

7 files changed

Lines changed: 12 additions & 75 deletions

File tree

‎command/clean_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ func TestCleanYes(t *testing.T) {
1313
repo := util.NewTestRepo(t, false)
1414
defer repo.Remove()
1515
repo.Seed()
16-
17-
repoPath := repo.PathIn("")
18-
defer os.Chdir(repoPath)
19-
os.Chdir(repoPath)
16+
os.Chdir(repo.PathIn(""))
2017

2118
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
2219

‎command/commit_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ func TestCommitDefaultOptions(t *testing.T) {
1313
repo := util.NewTestRepo(t, false)
1414
defer repo.Remove()
1515
repo.Seed()
16-
17-
repoPath := repo.PathIn("")
18-
defer os.Chdir(repoPath)
19-
os.Chdir(repoPath)
16+
os.Chdir(repo.PathIn(""))
2017

2118
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
2219

‎command/init_test.go‎

Lines changed: 5 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,7 @@ import (
1111

1212
func TestInitNoGitRepo(t *testing.T) {
1313
repo := util.NewTestRepo(t, false)
14-
repoPath := repo.PathIn("")
15-
os.Chdir(repoPath)
14+
os.Chdir(repo.PathIn(""))
1615
repo.Remove()
1716

1817
ui := new(cli.MockUi)
@@ -30,10 +29,7 @@ func TestInitDefaultOptions(t *testing.T) {
3029
repo := util.NewTestRepo(t, false)
3130
defer repo.Remove()
3231
repo.Seed()
33-
34-
repoPath := repo.PathIn("")
35-
defer os.Chdir(repoPath)
36-
os.Chdir(repoPath)
32+
os.Chdir(repo.PathIn(""))
3733

3834
ui := new(cli.MockUi)
3935
c := InitCmd{Ui: ui}
@@ -62,10 +58,7 @@ func TestInitTerminalFalse(t *testing.T) {
6258
repo := util.NewTestRepo(t, false)
6359
defer repo.Remove()
6460
repo.Seed()
65-
66-
repoPath := repo.PathIn("")
67-
defer os.Chdir(repoPath)
68-
os.Chdir(repoPath)
61+
os.Chdir(repo.PathIn(""))
6962

7063
ui := new(cli.MockUi)
7164
c := InitCmd{Ui: ui}
@@ -87,10 +80,7 @@ func TestInitTags(t *testing.T) {
8780
repo := util.NewTestRepo(t, false)
8881
defer repo.Remove()
8982
repo.Seed()
90-
91-
repoPath := repo.PathIn("")
92-
defer os.Chdir(repoPath)
93-
os.Chdir(repoPath)
83+
os.Chdir(repo.PathIn(""))
9484

9585
ui := new(cli.MockUi)
9686
c := InitCmd{Ui: ui}
@@ -112,10 +102,7 @@ func TestClearTags(t *testing.T) {
112102
repo := util.NewTestRepo(t, false)
113103
defer repo.Remove()
114104
repo.Seed()
115-
116-
repoPath := repo.PathIn("")
117-
defer os.Chdir(repoPath)
118-
os.Chdir(repoPath)
105+
os.Chdir(repo.PathIn(""))
119106

120107
ui := new(cli.MockUi)
121108
c := InitCmd{Ui: ui}

‎command/record_test.go‎

Lines changed: 2 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -15,10 +15,7 @@ func TestRecordInvalidFile(t *testing.T) {
1515
repo := util.NewTestRepo(t, false)
1616
defer repo.Remove()
1717
repo.Seed()
18-
19-
repoPath := repo.PathIn("")
20-
defer os.Chdir(repoPath)
21-
os.Chdir(repoPath)
18+
os.Chdir(repo.PathIn(""))
2219

2320
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
2421

@@ -37,10 +34,7 @@ func TestRecordNoFile(t *testing.T) {
3734
repo := util.NewTestRepo(t, false)
3835
defer repo.Remove()
3936
repo.Seed()
40-
41-
repoPath := repo.PathIn("")
42-
defer os.Chdir(repoPath)
43-
os.Chdir(repoPath)
37+
os.Chdir(repo.PathIn(""))
4438

4539
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
4640

@@ -59,9 +53,7 @@ func TestRecordFile(t *testing.T) {
5953
repo := util.NewTestRepo(t, false)
6054
defer repo.Remove()
6155
repo.Seed()
62-
6356
repoPath := repo.PathIn("")
64-
defer os.Chdir(repoPath)
6557
os.Chdir(repoPath)
6658

6759
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
@@ -95,9 +87,7 @@ func TestRecordTerminal(t *testing.T) {
9587
repo := util.NewTestRepo(t, false)
9688
defer repo.Remove()
9789
repo.Seed()
98-
9990
repoPath := repo.PathIn("")
100-
defer os.Chdir(repoPath)
10191
os.Chdir(repoPath)
10292

10393
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})

‎command/report_test.go‎

Lines changed: 0 additions & 25 deletions
Original file line numberDiff line numberDiff line change
@@ -14,11 +14,6 @@ import (
1414
func TestReportDefaultOptions(t *testing.T) {
1515
repo := util.NewTestRepo(t, false)
1616
defer repo.Remove()
17-
18-
curDir, err := os.Getwd()
19-
util.CheckFatal(t, err)
20-
defer os.Chdir(curDir)
21-
2217
os.Chdir(repo.PathIn(""))
2318

2419
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
@@ -46,11 +41,6 @@ func TestReportDefaultOptions(t *testing.T) {
4641
func TestReportAll(t *testing.T) {
4742
repo := util.NewTestRepo(t, false)
4843
defer repo.Remove()
49-
50-
curDir, err := os.Getwd()
51-
util.CheckFatal(t, err)
52-
defer os.Chdir(curDir)
53-
5444
os.Chdir(repo.PathIn(""))
5545

5646
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
@@ -78,11 +68,6 @@ func TestReportAll(t *testing.T) {
7868
func TestReportTimelineHours(t *testing.T) {
7969
repo := util.NewTestRepo(t, false)
8070
defer repo.Remove()
81-
82-
curDir, err := os.Getwd()
83-
util.CheckFatal(t, err)
84-
defer os.Chdir(curDir)
85-
8671
os.Chdir(repo.PathIn(""))
8772

8873
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
@@ -110,11 +95,6 @@ func TestReportTimelineHours(t *testing.T) {
11095
func TestReportTimelineCommits(t *testing.T) {
11196
repo := util.NewTestRepo(t, false)
11297
defer repo.Remove()
113-
114-
curDir, err := os.Getwd()
115-
util.CheckFatal(t, err)
116-
defer os.Chdir(curDir)
117-
11898
os.Chdir(repo.PathIn(""))
11999

120100
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
@@ -142,11 +122,6 @@ func TestReportTimelineCommits(t *testing.T) {
142122
func TestReportFiles(t *testing.T) {
143123
repo := util.NewTestRepo(t, false)
144124
defer repo.Remove()
145-
146-
curDir, err := os.Getwd()
147-
util.CheckFatal(t, err)
148-
defer os.Chdir(curDir)
149-
150125
os.Chdir(repo.PathIn(""))
151126

152127
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})

‎command/status_test.go‎

Lines changed: 1 addition & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ func TestStatusDefaultOptions(t *testing.T) {
1313
repo := util.NewTestRepo(t, false)
1414
defer repo.Remove()
1515
repo.Seed()
16-
17-
repoPath := repo.PathIn("")
18-
defer os.Chdir(repoPath)
19-
os.Chdir(repoPath)
16+
os.Chdir(repo.PathIn(""))
2017

2118
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
2219

‎command/uninit_test.go‎

Lines changed: 2 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -13,10 +13,7 @@ func TestUninitNotGTM(t *testing.T) {
1313
repo := util.NewTestRepo(t, false)
1414
defer repo.Remove()
1515
repo.Seed()
16-
17-
repoPath := repo.PathIn("")
18-
defer os.Chdir(repoPath)
19-
os.Chdir(repoPath)
16+
os.Chdir(repo.PathIn(""))
2017

2118
ui := new(cli.MockUi)
2219
c := UninitCmd{Ui: ui}
@@ -33,10 +30,7 @@ func TestUninitWithDefaults(t *testing.T) {
3330
repo := util.NewTestRepo(t, false)
3431
defer repo.Remove()
3532
repo.Seed()
36-
37-
repoPath := repo.PathIn("")
38-
defer os.Chdir(repoPath)
39-
os.Chdir(repoPath)
33+
os.Chdir(repo.PathIn(""))
4034

4135
(InitCmd{Ui: new(cli.MockUi)}).Run([]string{})
4236

0 commit comments

Comments
 (0)