Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Don't import db1 #105

Merged
merged 6 commits into from
Nov 7, 2023
Merged

Don't import db1 #105

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
bcf7e8e
Use testbot with noUse
Powersource Oct 26, 2023
3b89efb
Don't use db1 index functions
Powersource Oct 26, 2023
cb9d209
noUse->noDefaultUse
Powersource Oct 30, 2023
1880e22
Merge branch 'master' of github.com:ssbc/ssb-tribes into no-use-testbot
Powersource Nov 2, 2023
ffa8481
Fix replicate tests by using new fixed post compat
Powersource Nov 2, 2023
bfbe6bf
Merge branch 'master' of github.com:ssbc/ssb-tribes into no-use-testbot
Powersource Nov 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
114 changes: 104 additions & 10 deletions package-lock.json
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

4 changes: 2 additions & 2 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,9 +42,9 @@
"devDependencies": {
"cross-env": "^7.0.3",
"is-canonical-base64": "^1.1.1",
"scuttle-testbot": "^2.1.0",
"scuttle-testbot": "^2.2.0",
"ssb-box2": "^7.4.0",
"ssb-db2": "^7.1.1",
"ssb-db2": "^8.0.0",
"ssb-replicate": "^1.3.3",
"standard": "^17.1.0",
"tap-arc": "^0.4.0",
Expand Down
6 changes: 3 additions & 3 deletions test/helpers/test-bot.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ module.exports = function TestBot (opts = {}) {
.use(require('ssb-classic'))
.use(require('ssb-db2/compat'))
.use(require('ssb-db2/compat/feedstate'))
// .use(require("ssb-db2/compat/publish"))
.use(require("ssb-db2/compat/post"))
.use(require('ssb-box2'))
.use(require('../..')) // ssb-tribes - NOTE load it after ssb-backlinks

Expand All @@ -33,8 +33,8 @@ module.exports = function TestBot (opts = {}) {
legacyMode: true,
...opts.box2
},
// we don't want testbot to import db2 for us, we want more granularity and control of dep versions
db1: true,
// we don't want testbot to import db1 or db2 for us, we want to control what db2 plugins get imported
noDefaultUse: true,
...opts
})

Expand Down
12 changes: 2 additions & 10 deletions test/rebuild.test.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,6 @@ test('rebuild (I am added to a group)', async t => {
// time for rebuilding
await p(setTimeout)(500)

t.true(me.status().sync.sync, 'all indexes updated')

const msgs = await pull(
me.db.query(
where(and(
Expand Down Expand Up @@ -243,12 +241,6 @@ test('rebuild from listen.addMember', t => {
// NOTE with auto-rebuild active, this listener gets hit twice:
// 1. first time we see group/add-member (unboxed with DM key)
// 2. after rebuild
function checkRebuildDone (done) {
if (A.status().sync.sync) return done()

console.log('waiting for rebuild')
setTimeout(() => checkRebuildDone(done), 500)
}
pull(
listen.addMember(A),
pull.filter(m => !m.sync),
Expand All @@ -259,12 +251,12 @@ test('rebuild from listen.addMember', t => {
// (2) B invites A

if (heardCount === 2) {
checkRebuildDone(() => {
setTimeout(() => {
A.close(err => {
t.error(err, 'A closed')
t.end()
})
})
}, 500)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

is that works, that's cool. I prefer more deterministic things, but all good

}
})
)
Expand Down