Commit d9ed92d7 authored by Hamdi Allam's avatar Hamdi Allam

assert DB_USER and mark e2e tests for parallel execution

parent 9645cf22
...@@ -95,8 +95,6 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) { ...@@ -95,8 +95,6 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) {
depositInfo, err := e2etest_utils.ParseDepositInfo(portalDepositReceipt) depositInfo, err := e2etest_utils.ParseDepositInfo(portalDepositReceipt)
require.NoError(t, err) require.NoError(t, err)
depositL2TxHash := types.NewTx(depositInfo.DepositTx).Hash()
// wait for processor catchup // wait for processor catchup
require.NoError(t, utils.WaitFor(context.Background(), 500*time.Millisecond, func() (bool, error) { require.NoError(t, utils.WaitFor(context.Background(), 500*time.Millisecond, func() (bool, error) {
l1Header := testSuite.Indexer.L1Processor.LatestProcessedHeader() l1Header := testSuite.Indexer.L1Processor.LatestProcessedHeader()
...@@ -106,7 +104,7 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) { ...@@ -106,7 +104,7 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) {
aliceDeposits, err := testSuite.DB.BridgeTransfers.L1BridgeDepositsByAddress(aliceAddr) aliceDeposits, err := testSuite.DB.BridgeTransfers.L1BridgeDepositsByAddress(aliceAddr)
require.NoError(t, err) require.NoError(t, err)
require.Equal(t, portalDepositTx.Hash(), aliceDeposits[0].L1TransactionHash) require.Equal(t, portalDepositTx.Hash(), aliceDeposits[0].L1TransactionHash)
require.Equal(t, depositL2TxHash, aliceDeposits[0].L2TransactionHash) require.Equal(t, types.NewTx(depositInfo.DepositTx).Hash(), aliceDeposits[0].L2TransactionHash)
deposit := aliceDeposits[0].L1BridgeDeposit deposit := aliceDeposits[0].L1BridgeDeposit
require.Equal(t, depositInfo.DepositTx.SourceHash, deposit.TransactionSourceHash) require.Equal(t, depositInfo.DepositTx.SourceHash, deposit.TransactionSourceHash)
...@@ -119,6 +117,9 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) { ...@@ -119,6 +117,9 @@ func TestE2EBridgeTransfersOptimismPortalETHReceive(t *testing.T) {
// deposit was not sent through the cross domain messenger // deposit was not sent through the cross domain messenger
require.Nil(t, deposit.CrossDomainMessengerNonce) require.Nil(t, deposit.CrossDomainMessengerNonce)
// (2) Test Deposit Finalization
// Nothing to do as we rely on the derivation process to include the deposit
} }
func TestE2EBridgeTransfersStandardBridgeETHWithdrawal(t *testing.T) { func TestE2EBridgeTransfersStandardBridgeETHWithdrawal(t *testing.T) {
......
...@@ -53,6 +53,10 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite { ...@@ -53,6 +53,10 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite {
opSys, err := opCfg.Start() opSys, err := opCfg.Start()
require.NoError(t, err) require.NoError(t, err)
// E2E tests can run on the order of magnitude of minutes. Once
// the system is running, mark this test for Parallel execution
t.Parallel()
// Indexer Configuration and Start // Indexer Configuration and Start
indexerCfg := config.Config{ indexerCfg := config.Config{
Logger: logger, Logger: logger,
...@@ -112,6 +116,8 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite { ...@@ -112,6 +116,8 @@ func createE2ETestSuite(t *testing.T) E2ETestSuite {
func setupTestDatabase(t *testing.T) string { func setupTestDatabase(t *testing.T) string {
user := os.Getenv("DB_USER") user := os.Getenv("DB_USER")
require.NotEmpty(t, user, "DB_USER env variable expected to instantiate test database")
pg, err := sql.Open("pgx", fmt.Sprintf("postgres://%s@localhost:5432?sslmode=disable", user)) pg, err := sql.Open("pgx", fmt.Sprintf("postgres://%s@localhost:5432?sslmode=disable", user))
require.NoError(t, err) require.NoError(t, err)
require.NoError(t, pg.Ping()) require.NoError(t, pg.Ping())
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment