[golang-github-mitchellh-goamz] Add tests, dependencies, replace motain/gocheck with check.v1 Bump to a996a83b38c0e9190f388d1aa72a91
Jan Chaloupka
jchaloup at fedoraproject.org
Tue Oct 14 13:33:40 UTC 2014
commit d9619304159ca2381b3205ca418e52958e84b77c
Author: Jan Chaloupka <jchaloup at redhat.com>
Date: Fri Oct 10 20:47:57 2014 +0200
Add tests, dependencies, replace motain/gocheck with check.v1
Bump to a996a83b38c0e9190f388d1aa72a9178fdee5005
.gitignore | 2 +-
0001-motain-gocheck-to-check.v1.patch | 333 +++++++++++++++++++++++++++++++++
golang-github-mitchellh-goamz.spec | 25 ++-
sources | 2 +-
4 files changed, 356 insertions(+), 6 deletions(-)
---
diff --git a/.gitignore b/.gitignore
index 04ad311..245e1bd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1 +1 @@
-/goamz-9cad7da.tar.gz
+/goamz-a996a83b.tar.gz
diff --git a/0001-motain-gocheck-to-check.v1.patch b/0001-motain-gocheck-to-check.v1.patch
new file mode 100644
index 0000000..d3205bb
--- /dev/null
+++ b/0001-motain-gocheck-to-check.v1.patch
@@ -0,0 +1,333 @@
+From 1f60481b7b15da6fdf2fc3845f126b5fc60db251 Mon Sep 17 00:00:00 2001
+From: Jan Chaloupka <jchaloup at redhat.com>
+Date: Fri, 10 Oct 2014 21:14:33 +0200
+Subject: [PATCH] motain/gocheck to check.v1
+
+---
+ autoscaling/autoscaling_test.go | 2 +-
+ aws/attempt_test.go | 2 +-
+ aws/aws_test.go | 2 +-
+ ec2/ec2_test.go | 2 +-
+ ec2/ec2i_test.go | 2 +-
+ ec2/ec2t_test.go | 2 +-
+ ec2/sign_test.go | 2 +-
+ elb/elb_test.go | 2 +-
+ exp/mturk/mturk_test.go | 2 +-
+ exp/mturk/sign_test.go | 2 +-
+ exp/sdb/sdb_test.go | 2 +-
+ exp/sdb/sign_test.go | 2 +-
+ exp/sns/sns_test.go | 2 +-
+ iam/iam_test.go | 2 +-
+ iam/iami_test.go | 2 +-
+ iam/iamt_test.go | 2 +-
+ rds/rds_test.go | 2 +-
+ s3/multi_test.go | 2 +-
+ s3/s3_test.go | 2 +-
+ s3/s3i_test.go | 2 +-
+ s3/s3t_test.go | 2 +-
+ s3/sign_test.go | 2 +-
+ testutil/suite.go | 2 +-
+ 23 files changed, 23 insertions(+), 23 deletions(-)
+
+diff --git a/autoscaling/autoscaling_test.go b/autoscaling/autoscaling_test.go
+index 8cccdc2..7f094ef 100644
+--- a/autoscaling/autoscaling_test.go
++++ b/autoscaling/autoscaling_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/mitchellh/goamz/autoscaling"
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ func Test(t *testing.T) {
+diff --git a/aws/attempt_test.go b/aws/attempt_test.go
+index 1fda5bf..2c5f4db 100644
+--- a/aws/attempt_test.go
++++ b/aws/attempt_test.go
+@@ -2,7 +2,7 @@ package aws_test
+
+ import (
+ "github.com/mitchellh/goamz/aws"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "time"
+ )
+
+diff --git a/aws/aws_test.go b/aws/aws_test.go
+index 78cbbaf..1ff6ebe 100644
+--- a/aws/aws_test.go
++++ b/aws/aws_test.go
+@@ -2,7 +2,7 @@ package aws_test
+
+ import (
+ "github.com/mitchellh/goamz/aws"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "io/ioutil"
+ "os"
+ "strings"
+diff --git a/ec2/ec2_test.go b/ec2/ec2_test.go
+index 93f2eaf..f4a115f 100644
+--- a/ec2/ec2_test.go
++++ b/ec2/ec2_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/ec2"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ func Test(t *testing.T) {
+diff --git a/ec2/ec2i_test.go b/ec2/ec2i_test.go
+index 3773041..7b56446 100644
+--- a/ec2/ec2i_test.go
++++ b/ec2/ec2i_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/ec2"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // AmazonServer represents an Amazon EC2 server.
+diff --git a/ec2/ec2t_test.go b/ec2/ec2t_test.go
+index fe50356..447bdbc 100644
+--- a/ec2/ec2t_test.go
++++ b/ec2/ec2t_test.go
+@@ -6,7 +6,7 @@ import (
+ "github.com/mitchellh/goamz/ec2"
+ "github.com/mitchellh/goamz/ec2/ec2test"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "regexp"
+ "sort"
+ )
+diff --git a/ec2/sign_test.go b/ec2/sign_test.go
+index 86d203e..3bd9a34 100644
+--- a/ec2/sign_test.go
++++ b/ec2/sign_test.go
+@@ -3,7 +3,7 @@ package ec2_test
+ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/ec2"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // EC2 ReST authentication docs: http://goo.gl/fQmAN
+diff --git a/elb/elb_test.go b/elb/elb_test.go
+index d0a5caa..22c1be0 100644
+--- a/elb/elb_test.go
++++ b/elb/elb_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/elb"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "testing"
+ )
+
+diff --git a/exp/mturk/mturk_test.go b/exp/mturk/mturk_test.go
+index ab21e9c..df181ae 100644
+--- a/exp/mturk/mturk_test.go
++++ b/exp/mturk/mturk_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/exp/mturk"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "net/url"
+ "testing"
+ )
+diff --git a/exp/mturk/sign_test.go b/exp/mturk/sign_test.go
+index b024fc3..884f797 100644
+--- a/exp/mturk/sign_test.go
++++ b/exp/mturk/sign_test.go
+@@ -3,7 +3,7 @@ package mturk_test
+ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/exp/mturk"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // Mechanical Turk REST authentication docs: http://goo.gl/wrzfn
+diff --git a/exp/sdb/sdb_test.go b/exp/sdb/sdb_test.go
+index d194853..345d8ee 100644
+--- a/exp/sdb/sdb_test.go
++++ b/exp/sdb/sdb_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/exp/sdb"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "testing"
+ )
+
+diff --git a/exp/sdb/sign_test.go b/exp/sdb/sign_test.go
+index 6ebd1c4..ee6afe0 100644
+--- a/exp/sdb/sign_test.go
++++ b/exp/sdb/sign_test.go
+@@ -3,7 +3,7 @@ package sdb_test
+ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/exp/sdb"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // SimpleDB ReST authentication docs: http://goo.gl/CaY81
+diff --git a/exp/sns/sns_test.go b/exp/sns/sns_test.go
+index 3eb97f4..221164c 100644
+--- a/exp/sns/sns_test.go
++++ b/exp/sns/sns_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/exp/sns"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "testing"
+ )
+
+diff --git a/iam/iam_test.go b/iam/iam_test.go
+index 719a018..3ee976e 100644
+--- a/iam/iam_test.go
++++ b/iam/iam_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/iam"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "strings"
+ "testing"
+ )
+diff --git a/iam/iami_test.go b/iam/iami_test.go
+index 61e5be0..71dd7a9 100644
+--- a/iam/iami_test.go
++++ b/iam/iami_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/iam"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "net/url"
+ )
+
+diff --git a/iam/iamt_test.go b/iam/iamt_test.go
+index 2e3449b..5c21d6d 100644
+--- a/iam/iamt_test.go
++++ b/iam/iamt_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/iam"
+ "github.com/mitchellh/goamz/iam/iamtest"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // LocalServer represents a local ec2test fake server.
+diff --git a/rds/rds_test.go b/rds/rds_test.go
+index 0ccadb7..983f079 100644
+--- a/rds/rds_test.go
++++ b/rds/rds_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/rds"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "testing"
+ )
+
+diff --git a/s3/multi_test.go b/s3/multi_test.go
+index fbb03e0..26903cd 100644
+--- a/s3/multi_test.go
++++ b/s3/multi_test.go
+@@ -3,7 +3,7 @@ package s3_test
+ import (
+ "encoding/xml"
+ "github.com/mitchellh/goamz/s3"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "io"
+ "io/ioutil"
+ "strings"
+diff --git a/s3/s3_test.go b/s3/s3_test.go
+index 376c947..75f4f28 100644
+--- a/s3/s3_test.go
++++ b/s3/s3_test.go
+@@ -11,7 +11,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/s3"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ func Test(t *testing.T) {
+diff --git a/s3/s3i_test.go b/s3/s3i_test.go
+index 24f9ad4..d2ed6d1 100644
+--- a/s3/s3i_test.go
++++ b/s3/s3i_test.go
+@@ -11,7 +11,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/s3"
+ "github.com/mitchellh/goamz/testutil"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ "net"
+ "sort"
+ "time"
+diff --git a/s3/s3t_test.go b/s3/s3t_test.go
+index d3d4996..ed8b9df 100644
+--- a/s3/s3t_test.go
++++ b/s3/s3t_test.go
+@@ -4,7 +4,7 @@ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/s3"
+ "github.com/mitchellh/goamz/s3/s3test"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ type LocalServer struct {
+diff --git a/s3/sign_test.go b/s3/sign_test.go
+index 9d9fe8d..3a1b877 100644
+--- a/s3/sign_test.go
++++ b/s3/sign_test.go
+@@ -3,7 +3,7 @@ package s3_test
+ import (
+ "github.com/mitchellh/goamz/aws"
+ "github.com/mitchellh/goamz/s3"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // S3 ReST authentication docs: http://goo.gl/G1LrK
+diff --git a/testutil/suite.go b/testutil/suite.go
+index 2d432a0..561036c 100644
+--- a/testutil/suite.go
++++ b/testutil/suite.go
+@@ -3,7 +3,7 @@ package testutil
+ import (
+ "flag"
+ "github.com/mitchellh/goamz/aws"
+- . "github.com/motain/gocheck"
++ . "gopkg.in/check.v1"
+ )
+
+ // Amazon must be used by all tested packages to determine whether to
+--
+1.9.3
+
diff --git a/golang-github-mitchellh-goamz.spec b/golang-github-mitchellh-goamz.spec
index a1c2361..c44f3d9 100644
--- a/golang-github-mitchellh-goamz.spec
+++ b/golang-github-mitchellh-goamz.spec
@@ -2,27 +2,33 @@
%global provider_tld com
%global project mitchellh
%global repo goamz
-%global commit 9cad7da945e699385c1a3e115aa255211921c9bb
+%global commit a996a83b38c0e9190f388d1aa72a9178fdee5005
%global import_path %{provider}.%{provider_tld}/%{project}/%{repo}
-%global shortcommit %(c=%{commit}; echo ${c:0:7})
+%global shortcommit %(c=%{commit}; echo ${c:0:8})
%global debug_package %{nil}
Name: golang-%{provider}-%{project}-%{repo}
Version: 0
-Release: 0.2.git%{shortcommit}%{?dist}
+Release: 0.3.git%{shortcommit}%{?dist}
Summary: An Amazon Library for Go
License: LGPLv3+
URL: http://%{import_path}
Source0: https://github.com/%{project}/%{repo}/archive/%{commit}/%{repo}-%{shortcommit}.tar.gz
BuildArch: noarch
+Patch0: 0001-motain-gocheck-to-check.v1.patch
+
%description
%{summary}.
%package devel
BuildRequires: golang >= 1.2.1-3
+BuildRequires: golang(gopkg.in/check.v1)
+BuildRequires: golang(github.com/vaughan0/go-ini)
Requires: golang >= 1.2.1-3
+Requires: golang(github.com/vaughan0/go-ini)
+Requires: golang(gopkg.in/check.v1)
Summary: A golang library for logging to systemd
Provides: golang(%{import_path}) = %{version}-%{release}
Provides: golang(%{import_path}/autoscaling) = %{version}-%{release}
@@ -40,15 +46,21 @@ Provides: golang(%{import_path}/s3) = %{version}-%{release}
%prep
%setup -q -n %{repo}-%{commit}
+%patch0 -p1
%build
%install
install -d -p %{buildroot}/%{gopath}/src/%{import_path}/
-for d in autoscaling aws ec2 elb exp iam rds route53 s3; do
+for d in autoscaling aws ec2 elb exp iam rds route53 s3 testutil; do
cp -pav $d %{buildroot}/%{gopath}/src/%{import_path}/
done
+%check
+# ec2,elb failing
+# rds,iam need network (bind)
+GOPATH=%{buildroot}%{gopath}:%{gopath} go test %{import_path}/{autoscaling,aws,exp/mturk,exp/sdb,exp/sns,route53,s3}
+
%files devel
%doc LICENSE README.md
%dir %{gopath}/src/%{provider}.%{provider_tld}/%{project}
@@ -76,8 +88,13 @@ done
%{gopath}/src/%{import_path}/route53/*
%dir %{gopath}/src/%{import_path}/s3
%{gopath}/src/%{import_path}/s3/*
+%dir %{gopath}/src/%{import_path}/testutil
+%{gopath}/src/%{import_path}/testutil/*
%changelog
+* Fri Oct 10 2014 jchaloup <jchaloup at redhat.com> - 0-0.3.git9cad7da
+- Add tests, dependencies, replace motain/gocheck with check.v1
+
* Fri Sep 19 2014 Lokesh Mandvekar <lsm5 at fedoraproject.org> - 0-0.2.git9cad7da
- Resolves: rhbz#1142399 - initial package upload
- don't redefine gopath
diff --git a/sources b/sources
index b59c7a3..1777173 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-265bb060a695d06d3499b6cb300dab63 goamz-9cad7da.tar.gz
+d82a2d95bc1b45785371bb1f64668b9d goamz-a996a83b.tar.gz
More information about the scm-commits
mailing list