This is an automated email from the ASF dual-hosted git repository.
sebb pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/whimsy.git
The following commit(s) were added to refs/heads/master by this push:
new 83e2a71e Attic xdocs no longer used by main code; use another public
SVN
83e2a71e is described below
commit 83e2a71e7fce6e9afc6dca383ff600e22eac1454
Author: Sebb <[email protected]>
AuthorDate: Mon Apr 28 17:33:36 2025 +0100
Attic xdocs no longer used by main code; use another public SVN
---
.github/workflows/unittestlib.yml | 1 +
lib/spec/lib/svn_spec.rb | 24 ++++++++++++------------
lib/spec/lib/svn_wunderbar_spec.rb | 20 ++++++++++----------
repository.yml | 1 +
4 files changed, 24 insertions(+), 22 deletions(-)
diff --git a/.github/workflows/unittestlib.yml
b/.github/workflows/unittestlib.yml
index a53c67a7..d28b567e 100644
--- a/.github/workflows/unittestlib.yml
+++ b/.github/workflows/unittestlib.yml
@@ -4,6 +4,7 @@ on:
paths:
- '**/unittestlib.yml'
- 'lib/**'
+ - 'repository.yml'
workflow_dispatch:
diff --git a/lib/spec/lib/svn_spec.rb b/lib/spec/lib/svn_spec.rb
index 8263ef9a..412ee7ed 100644
--- a/lib/spec/lib/svn_spec.rb
+++ b/lib/spec/lib/svn_spec.rb
@@ -220,21 +220,21 @@ describe ASF::SVN do
end
describe 'ASF:SVN.get' do
-# it "get(public checkout,'_template.xml') should return the revision and
contents" do
-# repo = File.join(ASF::SVN['attic-xdocs'],'_template.xml')
+# it "get(public checkout,'HEADER.html') should return the revision and
contents" do
+# repo = File.join(ASF::SVN['minutes'],'HEADER.html')
# revision, content = ASF::SVN.get(repo)
# expect(revision).to match(/\d+/)
# expect(content.size).to be > 1000 # need a better test
# end
- it "get(public url,'_template.xml') should return the revision and
contents" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ it "get(public url,'HEADER.html') should return the revision and contents"
do
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
revision, content = ASF::SVN.get(repo)
expect(revision).to match(/\d+/)
- expect(content.size).to be > 1000 # need a better test
+ expect(content.size).to be > 260 # need a better test
end
it "get(public url,'_____') should return 0 and nil" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_____')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'_____')
revision, content = ASF::SVN.get(repo)
expect(revision).to eq('0')
expect(content).to eq(nil)
@@ -253,18 +253,18 @@ describe ASF::SVN do
end
it "svn('info', path) should return 'Name: path'" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
out, _err = ASF::SVN.svn('info',repo)
- expect(out).to match(/^Name: _template.xml$/)
+ expect(out).to match(/^Name: HEADER.html$/)
end
it "svn('info', [path]) should return 'Name: path'" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
out, _err = ASF::SVN.svn('info',[repo])
- expect(out).to match(/^Name: _template.xml$/)
+ expect(out).to match(/^Name: HEADER.html$/)
end
it "svn('info', [path1, path2], {item: kind'}) should return 'file ...'" do
- path1 = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
- path2 = File.join(ASF::SVN.svnurl('attic-xdocs'),'jakarta.xml')
+ path1 = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
+ path2 =
File.join(ASF::SVN.svnurl('minutes'),'2000','board_minutes_2000_02_28.txt')
out, _err = ASF::SVN.svn('info',[path1, path2], {item: 'kind'})
expect(out).to match(/^file +https:/)
end
diff --git a/lib/spec/lib/svn_wunderbar_spec.rb
b/lib/spec/lib/svn_wunderbar_spec.rb
index a0186a9c..f23d5b1b 100644
--- a/lib/spec/lib/svn_wunderbar_spec.rb
+++ b/lib/spec/lib/svn_wunderbar_spec.rb
@@ -25,7 +25,7 @@ svnmucc_missing = $?.exitstatus == 0 ? false : 'svnmucc not
found'
describe 'ASF::SVN.svn_!' do
it "svn_!('info') should return array with Name:" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
rc, out = _json do |_|
ASF::SVN.svn_!('info', repo, _)
@@ -33,10 +33,10 @@ describe 'ASF::SVN.svn_!' do
expect(rc).to be(0)
expect(out['transcript'].class).to equal(Array)
- expect(out['transcript'].include?('Name: _template.xml')).to be(true)
+ expect(out['transcript'].include?('Name: HEADER.html')).to be(true)
end
it "svn_!('info', 'no file') should fail with E200009" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'___')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'___')
rc, out = _json do |_|
ASF::SVN.svn_!('info', repo, _)
@@ -63,7 +63,7 @@ describe 'ASF::SVN.svn_' do
end
it "svn_('info') should return array with Name:" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
rc, out = _json do |_|
ASF::SVN.svn_('info', repo, _)
@@ -71,10 +71,10 @@ describe 'ASF::SVN.svn_' do
expect(rc).to be(0)
expect(out['transcript'].class).to equal(Array)
- expect(out['transcript'].include?('Name: _template.xml')).to be(true)
+ expect(out['transcript'].include?('Name: HEADER.html')).to be(true)
end
it "svn_('info') should return array" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
rc, out = _json do |_|
ASF::SVN.svn_('info', repo, _, {dryrun: true})
@@ -82,11 +82,11 @@ describe 'ASF::SVN.svn_' do
expect(rc).to be(0)
expect(out['transcript'].class).to equal(Array)
- exp = ['svn', 'info', '--non-interactive', '--',
'https://svn.apache.org/repos/asf/attic/site/xdocs/projects/_template.xml']
+ exp = ['svn', 'info', '--non-interactive', '--',
'https://svn.apache.org/repos/asf/infrastructure/site/trunk/content/foundation/records/minutes/HEADER.html']
expect(out['transcript'][1]).to eq(exp.join(' '))
end
it "svn_('info', 'no file') should fail with E200009" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'___')
+ repo = File.join(ASF::SVN.svnurl('minutes'),'___')
rc, out = _json do |_|
ASF::SVN.svn_('info', repo, _)
@@ -170,8 +170,8 @@ describe 'ASF::SVN.svn_' do
end
describe 'ASF::SVN.update' do
- it "update('_template.xml') should return array" do
- repo = File.join(ASF::SVN.svnurl('attic-xdocs'),'_template.xml')
+ it "update('HEADER.html') should return array" do
+ repo = File.join(ASF::SVN.svnurl('minutes'),'HEADER.html')
rc, out = _json do |_|
ASF::SVN.update(repo, 'Dummy message', ENV_.new, _, {dryrun:true}) do
|tmpdir, contents|
diff --git a/repository.yml b/repository.yml
index fd59a659..d763f30d 100644
--- a/repository.yml
+++ b/repository.yml
@@ -132,6 +132,7 @@
url: private/documents/member_apps
depth: skip
+ # N.B. This is used as a public repo for tests, see svn_spec.rb and
svn_wunderbar_spec.rb
minutes:
url: asf/infrastructure/site/trunk/content/foundation/records/minutes
