aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShulhan <ms@kilabit.info>2018-06-03 17:01:24 +0700
committerShulhan <ms@kilabit.info>2018-06-03 23:51:33 +0700
commit113fc939dfcfdcb3f12192130c30f0c11e54a128 (patch)
tree3c6f27c832e974e27f2d29014dd784dafb3e84f3
parentc48a8a43e70e7d14558e32296683a6092072a1ab (diff)
downloadbeku-113fc939dfcfdcb3f12192130c30f0c11e54a128.tar.xz
Remove git submodule for testing
Using submodule is not a good way to represent real repository, because submodule use .git as file as metadata not .git as directory. This revert commit e8593ded.
-rw-r--r--.gitignore2
-rw-r--r--.gitmodules3
-rw-r--r--beku_test.go4
-rw-r--r--env_test.go11
-rw-r--r--package_git_test.go28
-rw-r--r--package_test.go34
6 files changed, 34 insertions, 48 deletions
diff --git a/.gitignore b/.gitignore
index d20d245..aec148f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,8 @@
/testdata/beku.db.exclude
/testdata/beku.db.save
/testdata/a/b/file
+/testdata/src/github.com/shuLhan/beku_test
+/testdata/src/github.com/shuLhan/share
/beku.test
/cover.html
/cover.out
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index 0fc5be2..0000000
--- a/.gitmodules
+++ /dev/null
@@ -1,3 +0,0 @@
-[submodule "testdata/src/github.com/shuLhan/beku_test"]
- path = testdata/src/github.com/shuLhan/beku_test
- url = https://github.com/shuLhan/beku_test
diff --git a/beku_test.go b/beku_test.go
index b8e46d9..62e8183 100644
--- a/beku_test.go
+++ b/beku_test.go
@@ -117,11 +117,13 @@ func TestMain(m *testing.M) {
testGitPkgShare = NewPackage(testGitRepoShare, testGitRepoShare, VCSModeGit)
// Always set the git test repo to latest version.
- err = testGitPkgCur.CheckoutVersion(testGitRepoVersion)
+ testEnv.NoConfirm = true
+ err = testEnv.Sync(testGitRepo, testGitRepo)
if err != nil {
fmt.Fprintln(os.Stderr, err)
os.Exit(1)
}
+ testEnv.NoConfirm = false
fmt.Printf("test env : %+v\n", *testEnv)
fmt.Printf("testGitPkgCur: %+v\n", *testGitPkgCur)
diff --git a/env_test.go b/env_test.go
index 30e1a17..456c160 100644
--- a/env_test.go
+++ b/env_test.go
@@ -485,17 +485,12 @@ func testEnvScan(t *testing.T) {
ImportPath: testGitRepo,
FullPath: filepath.Join(testEnv.dirSrc, testGitRepo),
RemoteName: "origin",
- RemoteURL: "git@github.com:shuLhan/beku_test.git",
- Version: "c9f69fb",
+ RemoteURL: "https://github.com/shuLhan/beku_test",
+ Version: "v0.2.0",
+ isTag: true,
vcs: VCSModeGit,
state: packageStateNew,
- DepsMissing: []string{
- "github.com/shuLhan/share/lib/text",
- },
}},
- expMissing: []string{
- "github.com/shuLhan/share/lib/text",
- },
}}
for _, c := range cases {
diff --git a/package_git_test.go b/package_git_test.go
index 8a67f29..ddd12ca 100644
--- a/package_git_test.go
+++ b/package_git_test.go
@@ -28,40 +28,30 @@ Use '--' to separate paths from revisions, like this:
}, {
desc: "With empty on new version",
curVersion: "v0.1.0",
- expStdout: `c9f69fb Rename test to main.go
-582b912 Add feature B.
-ec65455 Add feature A.
+ expStdout: `582b912 Add feature B.
`,
}, {
desc: "With empty on current version #1",
newVersion: "v0.1.0",
- expStdout: `c9f69fb Rename test to main.go
-582b912 Add feature B.
-ec65455 Add feature A.
+ expStdout: `582b912 Add feature B.
`,
}, {
desc: "With empty on current version #2",
newVersion: "v0.2.0",
- expStdout: `c9f69fb Rename test to main.go
-`,
}, {
desc: "With empty on new version (latest tag)",
curVersion: "v0.2.0",
- expStdout: `c9f69fb Rename test to main.go
-`,
}, {
desc: "With valid versions",
curVersion: "v0.1.0",
newVersion: "v0.2.0",
expStdout: `582b912 Add feature B.
-ec65455 Add feature A.
`,
}, {
desc: "With valid versions, but reversed",
curVersion: "v0.2.0",
newVersion: "v0.1.0",
expStdout: `582b912 Add feature B.
-ec65455 Add feature A.
`,
}}
@@ -81,6 +71,7 @@ ec65455 Add feature A.
err = testGitPkgCur.CompareVersion(testGitPkgNew)
if err != nil {
test.Assert(t, "err", c.expErr, err.Error(), true)
+ continue
}
testResetOutput(t, false)
@@ -161,8 +152,8 @@ func testGitScan(t *testing.T) {
expIsTag bool
}{{
desc: "Using current package",
- expVersion: "c9f69fb",
- expIsTag: false,
+ expVersion: "v0.2.0",
+ expIsTag: true,
}}
var err error
@@ -189,14 +180,7 @@ func testGitScanDeps(t *testing.T) {
expDeps []string
expDepsMissing []string
expPkgsMissing []string
- }{{
- expDepsMissing: []string{
- "github.com/shuLhan/share/lib/text",
- },
- expPkgsMissing: []string{
- "github.com/shuLhan/share/lib/text",
- },
- }}
+ }{{}}
var err error
diff --git a/package_test.go b/package_test.go
index 3361294..46bd5de 100644
--- a/package_test.go
+++ b/package_test.go
@@ -13,12 +13,13 @@ import (
func testPackageRemove(t *testing.T) {
cases := []struct {
- desc string
- pkg *Package
- expErr string
+ desc string
+ pkgName string
+ pkg *Package
+ expErr string
}{{
- desc: `Package is not exist`,
- pkg: NewPackage(testPkgNotExist, testPkgNotExist, VCSModeGit),
+ desc: `Package is not exist`,
+ pkgName: testPkgNotExist,
}, {
desc: `Package exist`,
pkg: testGitPkgShare,
@@ -27,6 +28,10 @@ func testPackageRemove(t *testing.T) {
for _, c := range cases {
t.Log(c.desc)
+ if len(c.pkgName) > 0 {
+ c.pkg = NewPackage(c.pkgName, c.pkgName, VCSModeGit)
+ }
+
err := c.pkg.Remove()
if err != nil {
test.Assert(t, "err", c.expErr, err, true)
@@ -42,7 +47,10 @@ func testPackageRemove(t *testing.T) {
expErr = fmt.Sprintf("stat %s: no such file or directory", pkg)
_, err = os.Stat(pkg)
- test.Assert(t, "pkg dir should not exist", expErr, err.Error(), true)
+
+ if err != nil {
+ test.Assert(t, "pkg dir should not exist", expErr, err.Error(), true)
+ }
}
}
@@ -60,7 +68,7 @@ func testPackageInstall(t *testing.T) {
FullPath: testGitPkgShare.FullPath,
RemoteName: gitDefRemoteName,
RemoteURL: "https://" + testGitRepoShare,
- Version: "9337967",
+ Version: "17828b8",
vcs: VCSModeGit,
state: packageStateNew,
},
@@ -455,14 +463,12 @@ func testGoInstall(t *testing.T) {
expStdout string
expStderr string
}{{
- desc: "Running #1",
- pkg: testGitPkgCur,
- expStderr: `main.go:6:2: cannot find package "github.com/shuLhan/share/lib/text" in any of:`,
+ desc: "Running #1",
+ pkg: testGitPkgCur,
}, {
desc: "Running with verbose",
pkg: testGitPkgCur,
isVerbose: true,
- expStderr: `main.go:6:2: cannot find package "github.com/shuLhan/share/lib/text" in any of:`,
}}
for _, c := range cases {
@@ -509,9 +515,9 @@ func testPackageString(t *testing.T) {
[package "github.com/shuLhan/beku_test"]
VCS = 1
RemoteName = origin
- RemoteURL = git@github.com:shuLhan/beku_test.git
- Version = c9f69fb
- IsTag = false
+ RemoteURL = https://` + testGitRepo + `
+ Version = v0.2.0
+ IsTag = true
Deps = []
RequiredBy = []
DepsMissing = []